From df04e33dbcb4e1760b81e7b66c49ee531ed26a6f Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Wed, 29 Nov 2023 11:28:56 +0100 Subject: [PATCH] Update license to GNU Affero GPL v3 --- .../septoriaapiicolamodel/DataMatrix.java | 5 +-- .../SeptoriaApiicolaModel.java | 39 ++++++++++--------- .../SeptoriaApiicolaModelTest.java | 5 +-- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/DataMatrix.java b/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/DataMatrix.java index 7fd0de5..077dc2d 100755 --- a/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/DataMatrix.java +++ b/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/DataMatrix.java @@ -1,7 +1,6 @@ /* * Copyright (c) 2016 NIBIO <http://www.nibio.no/>. - * - * This file is part of LygusRugulipennisModel. + * * 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 @@ -14,7 +13,7 @@ * * 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/>. - * + * */ package no.nibio.vips.model.septoriaapiicolamodel; diff --git a/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java b/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java index 89a4f61..08a56fd 100755 --- a/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java +++ b/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java @@ -1,7 +1,6 @@ /* - * Copyright (c) 2016 NIBIO <http://www.nibio.no/>. - * - * This file is part of LygusRugulipennisModel. + * Copyright (c) 2018 NIBIO <http://www.nibio.no/>. + * * 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 @@ -14,7 +13,7 @@ * * 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/>. - * + * */ package no.nibio.vips.model.septoriaapiicolamodel; @@ -138,21 +137,23 @@ public class SeptoriaApiicolaModel extends I18nImpl implements Model{ @Override public String getLicense() { return "\n" + - "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. \n" + - "\n" + - "This file is part of SeptoriaApiicolaModel.\n" + - "SeptoriaApiicolaModel 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" + - "SeptoriaApiicolaModel 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 SeptoriaApiicolaModel. If not, see <http://www.nibio.no/licenses/>."; + "/*\n" + + " * Copyright (c) 2018 NIBIO <http://www.nibio.no/>. \n" + + " *\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 diff --git a/src/test/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModelTest.java b/src/test/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModelTest.java index 24e2c2f..ccc384f 100755 --- a/src/test/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModelTest.java +++ b/src/test/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModelTest.java @@ -1,7 +1,6 @@ /* * Copyright (c) 2016 NIBIO <http://www.nibio.no/>. - * - * This file is part of LygusRugulipennisModel. + * * 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 @@ -14,7 +13,7 @@ * * 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/>. - * + * */ package no.nibio.vips.model.septoriaapiicolamodel; -- GitLab