Skip to content
Snippets Groups Projects
Commit 3d0f4072 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

[ci skip] Merge branch 'main' into release

parents 8fa3ad6c 3d03c40b
Branches
Tags
No related merge requests found
......@@ -10,7 +10,7 @@
<groupId>no.nibio.vips.model</groupId>
<artifactId>NaerstadModel</artifactId>
<version>1.1.2</version>
<version>1.1.3-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
......@@ -34,7 +34,7 @@
<dependency>
<groupId>no.nibio.vips</groupId>
<artifactId>VIPSCommon</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
</dependency>
</dependencies>
......
......@@ -631,27 +631,29 @@ public class NaerstadModel extends I18nImpl implements Model{
@Override
public String getLicense() {
return "\n" +
"Copyright (c) 2013-2015 NIBIO <http://www.nibio.no/>. \n" +
"\n" +
"This file is part of NaerstadModel.\n" +
"NaerstadModel 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" +
"NaerstadModel 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 NaerstadModel. If not, see <http://www.nibio.no/licenses/>.";
return
" Copyright (c) 2014 NIBIO <http://www.nibio.no/>. \n" +
" \n" +
" This file is part of NaerstadModel.\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
public String getCopyright() {
return "(c) 2013-2015 NIBIO (http://www.nibio.no/). Contact: post@nibio.no";
return "(c) 2013-2023 NIBIO (http://www.nibio.no/). Contact: post@nibio.no";
}
@Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment