Skip to content

Commit

Permalink
Merge pull request DSpace#9688 from DSpace/backport-9682-to-dspace-8_x
Browse files Browse the repository at this point in the history 
[Port dspace-8_x] DS-9323 - part 2: Updates creative commons license to 4.0 in example patch operation and geonames.org test data
  • Loading branch information
@tdonohue
tdonohue authored Jul 9, 2024
2 parents f2c7bd1 + 7720a6f commit 97baa39
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion ...app/src/main/java/org/dspace/app/rest/submit/factory/impl/CCLicenseAddPatchOperation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Example: <code>
* 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/"}]'
* </code>
*/
public class CCLicenseAddPatchOperation extends AddPatchOperation<String> {
Expand Down
4 changes: 2 additions & 2 deletions dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-record.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
80 changes: 40 additions & 40 deletions dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-records.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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)",
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 97baa39

Please sign in to comment.