From c3fec3fade575e17e36022de8360523ab8aec02e Mon Sep 17 00:00:00 2001 From: nwoodward Date: Mon, 8 Jul 2024 12:26:42 -0500 Subject: [PATCH] updated creative commons licenses version from 3.0 to 4.0 --- .../impl/CCLicenseAddPatchOperation.java | 2 +- .../org/dspace/app/rest/ror-record.json | 4 +- .../org/dspace/app/rest/ror-records.json | 80 +++++++++---------- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CCLicenseAddPatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CCLicenseAddPatchOperation.java index 0aab935298ae..dace7c99ed94 100644 --- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CCLicenseAddPatchOperation.java +++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CCLicenseAddPatchOperation.java @@ -25,7 +25,7 @@ * Example: * curl -X PATCH http://${dspace.server.url}/api/submission/workspaceitems/31599 -H "Content-Type: * application/json" -d '[{ "op": "add", "path": "/sections/cclicense/uri", - * "value":"https://creativecommons.org/licenses/by-nc-sa/3.0/us/"}]' + * "value":"https://creativecommons.org/licenses/by-nc-sa/4.0/us/"}]' * */ public class CCLicenseAddPatchOperation extends AddPatchOperation { diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-record.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-record.json index 2ed43a01535a..4d0cd97fd5b6 100644 --- a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-record.json +++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-record.json @@ -39,8 +39,8 @@ "code": "US.TX.423" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-records.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-records.json index d36f7ba74e5c..5f93bb7d07a0 100644 --- a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-records.json +++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-records.json @@ -53,8 +53,8 @@ "code": "US.TX.029" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -166,8 +166,8 @@ "code": "US.TX.423" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -298,8 +298,8 @@ "code": "US.TX.113" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -417,8 +417,8 @@ "code": "US.TX.439" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -532,8 +532,8 @@ "code": "US.TX.135" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -638,8 +638,8 @@ "code": "JP.39.1850156" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -750,8 +750,8 @@ "code": null }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -855,8 +855,8 @@ "code": "US.OK.143" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -986,8 +986,8 @@ "code": "AU.07.24600" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -1086,8 +1086,8 @@ "code": null }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -1198,8 +1198,8 @@ "code": "US.AL.119" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -1304,8 +1304,8 @@ "code": "US.FL.033" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -1416,8 +1416,8 @@ "code": "US.GA.045" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -1524,8 +1524,8 @@ "code": "US.OR.051" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -1626,8 +1626,8 @@ "code": "GB.ENG.F2" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": "SOUTH EAST (ENGLAND)", @@ -1752,8 +1752,8 @@ "code": null }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -1869,8 +1869,8 @@ "code": null }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -1984,8 +1984,8 @@ "code": "US.WI.035" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -2099,8 +2099,8 @@ "code": "US.WI.009" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null, @@ -2208,8 +2208,8 @@ "code": "US.WI.063" }, "license": { - "attribution": "Data from geonames.org under a CC-BY 3.0 license", - "license": "https://creativecommons.org/licenses/by/3.0/" + "attribution": "Data from geonames.org under a CC-BY 4.0 license", + "license": "https://creativecommons.org/licenses/by/4.0/" }, "nuts_level1": { "name": null,