From 8b649ac8a2599feff6ac1fd34e01fed8d071b2c6 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Wed, 15 Oct 2014 13:40:38 +0200
Subject: [PATCH] Changed License to Bioforsk Open Source License

---
 nb-configuration.xml                                 |  2 +-
 .../model/grassdryingmodel/GrassDryingModel.java     | 12 ++++++------
 .../model/grassdryingmodel/GrassDryingModelTest.java | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/nb-configuration.xml b/nb-configuration.xml
index db65a21..33e441e 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -13,6 +13,6 @@ You can copy and paste the single properties, into the pom.xml file and the IDE
 That way multiple projects can share the same settings (useful for formatting rules for example).
 Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.license>default_1</netbeans.hint.license>
+        <netbeans.hint.license>bioforsk_open_source_license.ftl</netbeans.hint.license>
     </properties>
 </project-shared-configuration>
diff --git a/src/main/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModel.java b/src/main/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModel.java
index 6624ebb..c21341b 100644
--- a/src/main/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModel.java
+++ b/src/main/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModel.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of GrassDryingModel.
  * GrassDryingModel 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.
+ * it under the terms of the Bioforsk Open Source License as published by 
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
  * 
  * GrassDryingModel 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
- * GNU Affero General Public License for more details.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with GrassDryingModel.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with GrassDryingModel.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/test/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModelTest.java b/src/test/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModelTest.java
index a1608d9..3134b63 100644
--- a/src/test/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModelTest.java
+++ b/src/test/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModelTest.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of GrassDryingModel.
  * GrassDryingModel 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.
+ * it under the terms of the Bioforsk Open Source License as published by 
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
  * 
  * GrassDryingModel 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
- * GNU Affero General Public License for more details.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with GrassDryingModel.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with GrassDryingModel.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
-- 
GitLab