From 58e02e1249b4ffd3f087b9d46b6ba9cb74acb9fb Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 29 Nov 2023 12:41:54 +0100
Subject: [PATCH] Update license to GNU Affero GPL v3
---
.../oatfloweringmodel/OatFloweringModel.java | 52 ++++++++++---------
1 file changed, 27 insertions(+), 25 deletions(-)
diff --git a/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java b/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java
index 4991014..bc30c44 100755
--- a/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java
+++ b/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java
@@ -2,18 +2,18 @@
* Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of OatFloweringModel.
- * OatFloweringModel is free software: you can redistribute it and/or modify
- * it under the terms of the NIBIO Open Source License as published by
- * NIBIO, either version 1 of the License, or (at your option) any
- * later version.
- *
- * OatFloweringModel is distributed in the hope that it will be useful,
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 PARTICULAR PURPOSE. See the
- * NIBIO Open Source License for more details.
- *
- * You should have received a copy of the NIBIO Open Source License
- * along with OatFloweringModel. If not, see <http://www.nibio.no/licenses/>.
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
@@ -152,21 +152,23 @@ public class OatFloweringModel extends I18nImpl implements Model{
@Override
public String getLicense() {
- return "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. \n" +
- "\n" +
- "This file is part of OatFloweringModel. \n" +
- "OatFloweringModel is free software: you can redistribute it and/or modify \n" +
- "it under the terms of the NIBIO Open Source License as published by \n" +
- "NIBIO, either version 1 of the License, or (at your option) any \n" +
- "later version. \n" +
- "\n" +
- "OatFloweringModel is distributed in the hope that it will be useful, \n" +
- "but WITHOUT ANY WARRANTY; without even the implied warranty of \n" +
- "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \n" +
- "NIBIO Open Source License for more details. \n" +
- "\n" +
- "You should have received a copy of the NIBIO Open Source License \n" +
- "along with OatFloweringModel. If not, see <http://www.nibio.no/licenses/>. \n";
+ return
+ " Copyright (c) 2014 NIBIO <http://www.nibio.no/>. \n" +
+ " \n" +
+ " This file is part of OatFloweringModel.\n" +
+ " This program is free software: you can redistribute it and/or modify\n" +
+ " it under the terms of the GNU Affero General Public License as published by\n" +
+ " the Free Software Foundation, either version 3 of the License, or\n" +
+ " (at your option) any later version.\n" +
+ " \n" +
+ " This program is distributed in the hope that it will be useful,\n" +
+ " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +
+ " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +
+ " GNU Affero General Public License for more details.\n" +
+ " \n" +
+ " You should have received a copy of the GNU Affero General Public License\n" +
+ " along with this program. If not, see <https://www.gnu.org/licenses/>.\n" +
+ " \n" ;
}
@Override
--
GitLab