Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseAGPL-3.0-or-later.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@philippconzett can you please add a release note for this PR? (I'm just adding a comment here because it's the first line under "files changed".

"rightsName": "AGPL 3.0 or later",
"rightsURI": "https://www.gnu.org/licenses/agpl.txt",
"rightsIdentifier": "AGPL-3.0-or-later",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "GNU Affero General Public License v3.0 or later.",
"rightsActive": "true",
"sortOrder": 20
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseApache-2.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "Apache 2.0",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the docs, we should add all these new licenses to the list at https://github.com/philippconzett/dataverse/blob/8512-standardize-license-configuration/doc/sphinx-guides/source/installation/config.rst#adding-licenses so they are easily downloadable to installations that would like to use them.

"rightsURI": "https://www.apache.org/licenses/LICENSE-2.0",
"rightsIdentifier": "Apache-2.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Apache License 2.0.",
"rightsActive": "true",
"sortOrder": 8
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseBSD-2-Clause.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "BSD 2-Clause",
"rightsURI": "https://spdx.org/licenses/BSD-2-Clause.html",
"rightsIdentifier": "BSD-2-Clause",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "BSD 2-Clause "Simplified" License.",
"rightsActive": "true",
"sortOrder": 9
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseBSD-3-Clause.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "BSD 3-Clause",
"rightsURI": "https://spdx.org/licenses/BSD-3-Clause.html",
"rightsIdentifier": "BSD-3-Clause",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "BSD 3-Clause "New" or "Revised" License.",
"rightsActive": "true",
"sortOrder": 10
}
11 changes: 11 additions & 0 deletions scripts/api/data/licenses/licenseCC-BY-3.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"rightsName": "CC BY 3.0",
"rightsURI": "https://creativecommons.org/licenses/by/3.0/",
"rightsIdentifier": "CC-BY-3.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Creative Commons Attribution 3.0 Unported.",
"rightsIconUrl": "https://licensebuttons.net/l/by/3.0/88x31.png",
"rightsActive": "true",
"sortOrder": 21
}
13 changes: 8 additions & 5 deletions scripts/api/data/licenses/licenseCC-BY-4.0.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "CC BY 4.0",
"uri": "http://creativecommons.org/licenses/by/4.0",
"shortDescription": "Creative Commons Attribution 4.0 International License.",
"iconUrl": "https://licensebuttons.net/l/by/4.0/88x31.png",
"active": true,
"rightsName": "CC BY 4.0",
"rightsURI": "https://creativecommons.org/licenses/by/4.0/",
"rightsIdentifier": "CC-BY-4.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Creative Commons Attribution 4.0 International.",
"rightsIconUrl": "https://licensebuttons.net/l/by/4.0/88x31.png",
"rightsActive": "true",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not surprisingly edu.harvard.iq.dataverse.api.Licenses.addLicense is failing because the field names have changed. In this stack trace, for example, the code is looking for uri rather than rightsURI: addlicense.txt

This pull request is great for showing a future direction, but the code needs to be adjust to add new fields to the database and we'd need to write SQL upgrade scripts to migrate the old licenses into the new fields.

"sortOrder": 2
}
11 changes: 11 additions & 0 deletions scripts/api/data/licenses/licenseCC-BY-NC-3.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"rightsName": "CC BY NC 3.0",
"rightsURI": "https://creativecommons.org/licenses/by-nc/3.0/",
"rightsIdentifier": "CC-BY-NC-3.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Creative Commons Attribution Non Commercial 3.0 Unported.",
"rightsIconUrl": "https://licensebuttons.net/l/by-nc/3.0/88x31.png",
"rightsActive": "true",
"sortOrder": 22
}
15 changes: 9 additions & 6 deletions scripts/api/data/licenses/licenseCC-BY-NC-4.0.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "CC BY-NC 4.0",
"uri": "http://creativecommons.org/licenses/by-nc/4.0",
"shortDescription": "Creative Commons Attribution-NonCommercial 4.0 International License.",
"iconUrl": "https://licensebuttons.net/l/by-nc/4.0/88x31.png",
"active": true,
"sortOrder": 4
"rightsName": "CC BY-NC 4.0",
"rightsURI": "https://creativecommons.org/licenses/by-nc/4.0/",
"rightsIdentifier": "CC-BY-NC-4.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Creative Commons Attribution Non Commercial 4.0 International.",
"rightsIconUrl": "https://licensebuttons.net/l/by-nc/4.0/88x31.png",
"rightsActive": "true",
"sortOrder": 3
}
15 changes: 9 additions & 6 deletions scripts/api/data/licenses/licenseCC-BY-NC-ND-4.0.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "CC BY-NC-ND 4.0",
"uri": "http://creativecommons.org/licenses/by-nc-nd/4.0",
"shortDescription": "Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.",
"iconUrl": "https://licensebuttons.net/l/by-nc-nd/4.0/88x31.png",
"active": true,
"sortOrder": 7
"rightsName": "CC BY-NC-ND 4.0",
"rightsURI": "https://creativecommons.org/licenses/by-nc-nd/4.0/",
"rightsIdentifier": "CC-BY-NC-ND-4.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Creative Commons Attribution Non Commercial No Derivatives 4.0 International.",
"rightsIconUrl": "https://licensebuttons.net/l/by-nc-nd/4.0/88x31.png",
"rightsActive": "true",
"sortOrder": 4
}
11 changes: 11 additions & 0 deletions scripts/api/data/licenses/licenseCC-BY-NC-SA-3.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"rightsName": "CC BY NC SA 3.0",
"rightsURI": "https://creativecommons.org/licenses/by-nc-sa/3.0/",
"rightsIdentifier": "CC-BY-NC-SA-3.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Creative Commons Attribution Non Commercial Share Alike 3.0 Unported.",
"rightsIconUrl": "https://licensebuttons.net/l/by-nc-sa/3.0/88x31.png",
"rightsActive": "true",
"sortOrder": 23
}
15 changes: 9 additions & 6 deletions scripts/api/data/licenses/licenseCC-BY-NC-SA-4.0.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "CC BY-NC-SA 4.0",
"uri": "http://creativecommons.org/licenses/by-nc-sa/4.0",
"shortDescription": "Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.",
"iconUrl": "https://licensebuttons.net/l/by-nc-sa/4.0/88x31.png",
"active": true,
"sortOrder": 3
"rightsName": "CC BY-NC-SA 4.0",
"rightsURI": "https://creativecommons.org/licenses/by-nc-sa/4.0/",
"rightsIdentifier": "CC-BY-NC-SA-4.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Creative Commons Attribution Non Commercial Share Alike 4.0 International.",
"rightsIconUrl": "https://licensebuttons.net/l/by-nc-sa/4.0/88x31.png",
"rightsActive": "true",
"sortOrder": 5
}
13 changes: 8 additions & 5 deletions scripts/api/data/licenses/licenseCC-BY-ND-4.0.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "CC BY-ND 4.0",
"uri": "http://creativecommons.org/licenses/by-nd/4.0",
"shortDescription": "Creative Commons Attribution-NoDerivatives 4.0 International License.",
"iconUrl": "https://licensebuttons.net/l/by-nd/4.0/88x31.png",
"active": true,
"rightsName": "CC BY-ND 4.0",
"rightsURI": "https://creativecommons.org/licenses/by-nd/4.0/",
"rightsIdentifier": "CC-BY-ND-4.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Creative Commons Attribution No Derivatives 4.0 International.",
"rightsIconUrl": "https://licensebuttons.net/l/by-sa/4.0/88x31.png",
"rightsActive": "true",
"sortOrder": 6
}
11 changes: 11 additions & 0 deletions scripts/api/data/licenses/licenseCC-BY-SA-3.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"rightsName": "CC BY SA 3.0",
"rightsURI": "https://creativecommons.org/licenses/by-sa/3.0/",
"rightsIdentifier": "CC-BY-SA-3.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Creative Commons Attribution Share Alike 3.0 Unported.",
"rightsIconUrl": "https://licensebuttons.net/l/by-sa/3.0/88x31.png",
"rightsActive": "true",
"sortOrder": 24
}
15 changes: 9 additions & 6 deletions scripts/api/data/licenses/licenseCC-BY-SA-4.0.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "CC BY-SA 4.0",
"uri": "http://creativecommons.org/licenses/by-sa/4.0",
"shortDescription": "Creative Commons Attribution-ShareAlike 4.0 International License.",
"iconUrl": "https://licensebuttons.net/l/by-sa/4.0/88x31.png",
"active": true,
"sortOrder": 5
"rightsName": "CC BY-SA 4.0",
"rightsURI": "https://creativecommons.org/licenses/by-sa/4.0/",
"rightsIdentifier": "CC-BY-SA-4.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Creative Commons Attribution Share Alike 4.0 International.",
"rightsIconUrl": "https://licensebuttons.net/l/by/4.0/88x31.png",
"rightsActive": "true",
"sortOrder": 7
}
13 changes: 8 additions & 5 deletions scripts/api/data/licenses/licenseCC0-1.0.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "CC0 1.0",
"uri": "http://creativecommons.org/publicdomain/zero/1.0",
"shortDescription": "Creative Commons CC0 1.0 Universal Public Domain Dedication.",
"iconUrl": "https://licensebuttons.net/p/zero/1.0/88x31.png",
"active": true,
"rightsName": "CC0 1.0",
"rightsURI": "https://creativecommons.org/publicdomain/zero/1.0/",
"rightsIdentifier": "CC0-1.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Creative Commons Zero v1.0 Universal.",
"rightsIconUrl": "https://licensebuttons.net/p/zero/1.0/88x31.png",
"rightsActive": "true",
"sortOrder": 1
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseCECILL-2.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "CECILL 2.0",
"rightsURI": "http://www.cecill.info/licences/Licence_CeCILL_V2-en.html",
"rightsIdentifier": "CECILL-2.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "CeCILL Free Software License Agreement v2.0.",
"rightsActive": "true",
"sortOrder": 25
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseCECILL-B.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "CECILL B",
"rightsURI": "http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html",
"rightsIdentifier": "CECILL-B",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "CeCILL-B Free Software License Agreement.",
"rightsActive": "true",
"sortOrder": 26
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseCERN-OHL-1.1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "CERN OHL 1.1",
"rightsURI": "https://spdx.org/licenses/CERN-OHL-1.1.html",
"rightsIdentifier": "CERN-OHL-1.1",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "CERN Open Hardware Licence v1.1.",
"rightsActive": "true",
"sortOrder": 27
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseCERN-OHL-1.2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "CERN OHL 1.2",
"rightsURI": "https://spdx.org/licenses/CERN-OHL-1.2.html",
"rightsIdentifier": "CERN-OHL-1.2",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "CERN Open Hardware Licence v1.2.",
"rightsActive": "true",
"sortOrder": 28
}
11 changes: 11 additions & 0 deletions scripts/api/data/licenses/licenseGPL-2.0-only.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"rightsName": "GPL 2.0 only",
"rightsURI": "https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html",
"rightsIdentifier": "GPL-2.0-only",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "GNU General Public License v2.0 only.",
"rightsIconUrl": "https://licensebuttons.net/l/GPL/2.0/88x62.png",
"rightsActive": "true",
"sortOrder": 11
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseGPL-3.0-only.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "GPL 3.0 only",
"rightsURI": "https://www.gnu.org/licenses/gpl-3.0-standalone.html",
"rightsIdentifier": "GPL-3.0-only",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "GNU General Public License v3.0 only.",
"rightsActive": "true",
"sortOrder": 12
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseGPL-3.0-or-later.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "GPL 3.0 or later",
"rightsURI": "https://www.gnu.org/licenses/gpl-3.0-standalone.html",
"rightsIdentifier": "GPL-3.0-or-later",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "GNU General Public License v3.0 or later.",
"rightsActive": "true",
"sortOrder": 13
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseLGPL-3.0-only.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "LGPL 3.0 only",
"rightsURI": "https://www.gnu.org/licenses/lgpl-3.0-standalone.html",
"rightsIdentifier": "LGPL-3.0-only",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "GNU Lesser General Public License v3.0 only.",
"rightsActive": "true",
"sortOrder": 14
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseLGPL-3.0-or-later.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "LGPL 3.0 or later",
"rightsURI": "https://www.gnu.org/licenses/lgpl-3.0-standalone.html",
"rightsIdentifier": "LGPL-3.0-or-later",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "GNU Lesser General Public License v3.0 or later.",
"rightsActive": "true",
"sortOrder": 15
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseMIT.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "MIT License",
"rightsURI": "https://spdx.org/licenses/MIT.html",
"rightsIdentifier": "MIT",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "MIT License.",
"rightsActive": "true",
"sortOrder": 16
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseMPL-2.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "MPL 2.0",
"rightsURI": "https://www.mozilla.org/en-US/MPL/2.0/",
"rightsIdentifier": "MPL-2.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Mozilla Public License 2.0.",
"rightsActive": "true",
"sortOrder": 17
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseODC-By-1.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "ODC-By 1.0",
"rightsURI": "https://opendatacommons.org/licenses/by/1.0/",
"rightsIdentifier": "ODC-By-1.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Open Data Commons Attribution License v1.0.",
"rightsActive": "true",
"sortOrder": 19
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseODbL-1.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "ODbL 1.0",
"rightsURI": "https://opendatacommons.org/licenses/odbl/1-0/",
"rightsIdentifier": "ODbL-1.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Open Data Commons Open Database License v1.0.",
"rightsActive": "true",
"sortOrder": 18
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseTAPR-OHL-1.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "TAPR OHL 1.0",
"rightsURI": "https://spdx.org/licenses/TAPR-OHL-1.0.html",
"rightsIdentifier": "TAPR-OHL-1.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "TAPR Open Hardware License v1.0.",
"rightsActive": "true",
"sortOrder": 30
}
10 changes: 10 additions & 0 deletions scripts/api/data/licenses/licenseetalab-2.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rightsName": "Etalab 2.0",
"rightsURI": "https://spdx.org/licenses/etalab-2.0.html",
"rightsIdentifier": "etalab-2.0",
"rightsIdentifierScheme": "SPDX",
"schemeURI": "https://spdx.org/licenses/",
"rightsShortDescription": "Etalab Open License 2.0.",
"rightsActive": "true",
"sortOrder": 29
}