From d575c25ebdb8a1ee496936689d81451d16fb910b Mon Sep 17 00:00:00 2001 From: Graham Date: Wed, 29 Jan 2020 21:58:34 +0000 Subject: [PATCH] Switch license to GPLv3 or later I've been thinking about this for a while. On the one hand, using the "or later" clause means we have to place some trust in the Free Software Foundation. On the other hand, being able to adopt newer versions of the license without having to contact all contributors is useful for compatibility (e.g. Apache 2 and GPLv3). I recently noticed that Section 14 states that new versions of the license will be "similar in spirit" to the current version. I think this reduces the amount of trust we need to place in the FSF, as I'd hope that if a future license did diverge too much from the original spirit that a court might not consider it valid. Furthermore, if the FSF went totally crazy, there are many bigger and more important projects who would experience the same problem. --- README.md | 16 ++++++++-------- deob-annotations/README.md | 5 +++-- deob-annotations/pom.xml | 2 +- jsobject/README.md | 5 +++-- jsobject/pom.xml | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 1e83094358..0d10c3f268 100644 --- a/README.md +++ b/README.md @@ -130,22 +130,22 @@ OpenRS2 uses [Semantic Versioning][semver]. ## License -Unless otherwise stated, all code and data is licensed under version 3.0 (and -only version 3.0) of the [GNU General Public License][gpl]. The full terms are -available in the `COPYING` file. +Unless otherwise stated, all code and data is licensed under version 3.0 or +later of the [GNU General Public License][gpl]. The full terms are available +in the `COPYING` file. The `deob-annotations` and `jsobject` modules are instead licensed under -version 3.0 (and only version 3.0) of the -[GNU Lesser General Public License][lgpl]. The full terms are available in the -`COPYING.LESSER` file in each module's directory. +version 3.0 or later of the [GNU Lesser General Public License][lgpl]. The full +terms are available in the `COPYING.LESSER` file in each module's directory. ## Copyright Copyright (c) 2019-2020 OpenRS2 Authors OpenRS2 is free software: you can redistribute it and/or modify it under the -terms of version 3.0 of the GNU General Public License as published by the Free -Software Foundation. +terms of the GNU General Public License as published by the Free Software +Foundation, either version 3 of the License, or (at your option) any later +version. OpenRS2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A diff --git a/deob-annotations/README.md b/deob-annotations/README.md index 6bd2cabd50..ed188c2462 100644 --- a/deob-annotations/README.md +++ b/deob-annotations/README.md @@ -5,8 +5,9 @@ Copyright (c) 2019 OpenRS2 Authors OpenRS2 Deobfuscator Annotations is free software: you can redistribute it -and/or modify it under the terms of version 3.0 of the GNU Lesser General -Public License as published by the Free Software Foundation. +and/or modify it under the terms of the GNU Lesser General Public License as +published by the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. OpenRS2 Deobfuscator Annotations is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/deob-annotations/pom.xml b/deob-annotations/pom.xml index 284f43672a..5edbac7acb 100644 --- a/deob-annotations/pom.xml +++ b/deob-annotations/pom.xml @@ -18,7 +18,7 @@ - GNU Lesser General Public License v3.0 + GNU Lesser General Public License v3.0 or later https://www.gnu.org/licenses/lgpl-3.0.txt diff --git a/jsobject/README.md b/jsobject/README.md index a2fcc682a5..8e7386e838 100644 --- a/jsobject/README.md +++ b/jsobject/README.md @@ -5,8 +5,9 @@ Copyright (c) 2020 OpenRS2 Authors OpenRS2 JavaScript Object is free software: you can redistribute it and/or -modify it under the terms of version 3.0 of the GNU Lesser General Public -License as published by the Free Software Foundation. +modify it under the terms of the GNU Lesser General Public License as published +by the Free Software Foundation, either version 3 of the License, or (at your +option) any later version. OpenRS2 JavaScript Object is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY diff --git a/jsobject/pom.xml b/jsobject/pom.xml index a358e3a7b8..d28ec7a23d 100644 --- a/jsobject/pom.xml +++ b/jsobject/pom.xml @@ -15,7 +15,7 @@ Stubs for the netscape.javascript package. - GNU Lesser General Public License v3.0 + GNU Lesser General Public License v3.0 or later https://www.gnu.org/licenses/lgpl-3.0.txt