diff --git a/src/main/java/no/bioforsk/vips/core/service/ModelResource.java b/src/main/java/no/bioforsk/vips/core/service/ModelResource.java
index a9403c478e905f03d73891ab2094ff098ae93b5c..21c7bd75614df5b9845fb4124972b675539eed36 100644
--- a/src/main/java/no/bioforsk/vips/core/service/ModelResource.java
+++ b/src/main/java/no/bioforsk/vips/core/service/ModelResource.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResource.java b/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResource.java
index e7eb0eca5ab17598cd5f8748e45d6e2bfe025810..032c4c69755a7662ac66745a429a86711ce587fa 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResource.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResource.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/entity/ModelConfiguration.java b/src/main/java/no/bioforsk/vips/entity/ModelConfiguration.java
index f9ff1e774397f46d14433c0f53b2c9b55a2940dd..8feac0799f635cfebe744b9ff1a0467e7be9c72c 100644
--- a/src/main/java/no/bioforsk/vips/entity/ModelConfiguration.java
+++ b/src/main/java/no/bioforsk/vips/entity/ModelConfiguration.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/entity/Result.java b/src/main/java/no/bioforsk/vips/entity/Result.java
index d50042882362dcdbdbff0f0c70c3df25ddf32955..eebbe2441c2698302f04f8fc2f9797b5f85d2a88 100644
--- a/src/main/java/no/bioforsk/vips/entity/Result.java
+++ b/src/main/java/no/bioforsk/vips/entity/Result.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/entity/ResultImpl.java b/src/main/java/no/bioforsk/vips/entity/ResultImpl.java
index a436e050eb7a6deb656f43f0fdb175830723679b..3eec8c3f6c11326b20de22a6ce1a2cd5af433440 100644
--- a/src/main/java/no/bioforsk/vips/entity/ResultImpl.java
+++ b/src/main/java/no/bioforsk/vips/entity/ResultImpl.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/entity/Weather.java b/src/main/java/no/bioforsk/vips/entity/Weather.java
index 65dc38a9c1e64dc5cd51326b2cdd2ff2315c9bce..58504fbea79494075ff4120aafa085d474ff429e 100644
--- a/src/main/java/no/bioforsk/vips/entity/Weather.java
+++ b/src/main/java/no/bioforsk/vips/entity/Weather.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/entity/WeatherObservation.java b/src/main/java/no/bioforsk/vips/entity/WeatherObservation.java
index 110697fc53c48e10564e0b8f9d13ae660cfa1087..caeca8213cd6b4388360c7871e480f7483b1e81c 100644
--- a/src/main/java/no/bioforsk/vips/entity/WeatherObservation.java
+++ b/src/main/java/no/bioforsk/vips/entity/WeatherObservation.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/i18n/I18nImpl.java b/src/main/java/no/bioforsk/vips/i18n/I18nImpl.java
index 9feceda19e9dd1ce1961877981f107fbf4f18b3d..a5c829086062450321e5247ca7a363cd5919684f 100644
--- a/src/main/java/no/bioforsk/vips/i18n/I18nImpl.java
+++ b/src/main/java/no/bioforsk/vips/i18n/I18nImpl.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/i18n/LanguageUtil.java b/src/main/java/no/bioforsk/vips/i18n/LanguageUtil.java
index e730f4dbd4f372a27e5430670249db64afffe912..c22ddec3b40735ef5cd98cc00d3113baa8b5dbe0 100644
--- a/src/main/java/no/bioforsk/vips/i18n/LanguageUtil.java
+++ b/src/main/java/no/bioforsk/vips/i18n/LanguageUtil.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/model/ConfigValidationException.java b/src/main/java/no/bioforsk/vips/model/ConfigValidationException.java
index 95ee57493352a0099ea4fbc78bb1a2e6264eec7e..14ea85f6681cedc347225ec7da902e583811bc8a 100644
--- a/src/main/java/no/bioforsk/vips/model/ConfigValidationException.java
+++ b/src/main/java/no/bioforsk/vips/model/ConfigValidationException.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/model/Model.java b/src/main/java/no/bioforsk/vips/model/Model.java
index 573313d8bacb353697a5a6af4cc38e40c6cb239f..c44d0414cdf7ad14dabaf1ad120f36d763a4e65a 100644
--- a/src/main/java/no/bioforsk/vips/model/Model.java
+++ b/src/main/java/no/bioforsk/vips/model/Model.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/model/ModelExcecutionException.java b/src/main/java/no/bioforsk/vips/model/ModelExcecutionException.java
index efc58f50801e653e98a6cd4c20c20e2738b287fd..6d26ea12d33ee31bca58b0e710ac130ee2044f66 100644
--- a/src/main/java/no/bioforsk/vips/model/ModelExcecutionException.java
+++ b/src/main/java/no/bioforsk/vips/model/ModelExcecutionException.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/model/ModelId.java b/src/main/java/no/bioforsk/vips/model/ModelId.java
index 3c34864069dd1120e657525b6ab754b116077b65..793c1e7a9aa78e5031b0a9eff4550340790d87a2 100644
--- a/src/main/java/no/bioforsk/vips/model/ModelId.java
+++ b/src/main/java/no/bioforsk/vips/model/ModelId.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/util/ArrayUtil.java b/src/main/java/no/bioforsk/vips/util/ArrayUtil.java
index 640c8d15252def99fd16544fe9e0c5f473055b3d..1fd774b749a77d0f4b4190a8d40cbe358cb233ff 100644
--- a/src/main/java/no/bioforsk/vips/util/ArrayUtil.java
+++ b/src/main/java/no/bioforsk/vips/util/ArrayUtil.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/util/CommonNamespaces.java b/src/main/java/no/bioforsk/vips/util/CommonNamespaces.java
index 0ab3f08fdaeb31a4736b375c349c200d09aac7fd..c3d60bbb50befd827b5f310e097ed801b3f05394 100644
--- a/src/main/java/no/bioforsk/vips/util/CommonNamespaces.java
+++ b/src/main/java/no/bioforsk/vips/util/CommonNamespaces.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/util/DateMap.java b/src/main/java/no/bioforsk/vips/util/DateMap.java
index a1655cd57c5a88f600d2dee936cfe40d7f3ff1b9..8bf098e0ff1ec144bb778847bdedfcfb09299356 100644
--- a/src/main/java/no/bioforsk/vips/util/DateMap.java
+++ b/src/main/java/no/bioforsk/vips/util/DateMap.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/util/ExceptionUtil.java b/src/main/java/no/bioforsk/vips/util/ExceptionUtil.java
index 6b743726a8c3c5ad3c9624ca74386221064321ac..d0fb384ddbc59a713759fb5824cf666795dab495 100644
--- a/src/main/java/no/bioforsk/vips/util/ExceptionUtil.java
+++ b/src/main/java/no/bioforsk/vips/util/ExceptionUtil.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/util/InvalidAggregationTypeException.java b/src/main/java/no/bioforsk/vips/util/InvalidAggregationTypeException.java
index af9ed70b963ee1696c2f596c0e78498877506bfc..980015d16eb96ef0a1039e0626c261a91a63e2ec 100644
--- a/src/main/java/no/bioforsk/vips/util/InvalidAggregationTypeException.java
+++ b/src/main/java/no/bioforsk/vips/util/InvalidAggregationTypeException.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/util/JSONUtil.java b/src/main/java/no/bioforsk/vips/util/JSONUtil.java
index 2df45283a1489325bd2025dde54ce511cb7796fa..b826966f8f4fde65b181400755205211fd634059 100644
--- a/src/main/java/no/bioforsk/vips/util/JSONUtil.java
+++ b/src/main/java/no/bioforsk/vips/util/JSONUtil.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/util/MD5Encrypter.java b/src/main/java/no/bioforsk/vips/util/MD5Encrypter.java
index 7c32fb9dc27412a8faa7916c347c4b2895d5a8b1..266dff5ceb9cfadb2a960dff4f689ff751e2ced6 100644
--- a/src/main/java/no/bioforsk/vips/util/MD5Encrypter.java
+++ b/src/main/java/no/bioforsk/vips/util/MD5Encrypter.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/util/ServletUtil.java b/src/main/java/no/bioforsk/vips/util/ServletUtil.java
index 0388a8f725dc3b998652e623c7469cb5a5cbeea7..3b1e160c2fd0ba59433e587b6bca0c2887cefa0b 100644
--- a/src/main/java/no/bioforsk/vips/util/ServletUtil.java
+++ b/src/main/java/no/bioforsk/vips/util/ServletUtil.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/util/WeatherElements.java b/src/main/java/no/bioforsk/vips/util/WeatherElements.java
index 2411ec548d70560381168155d2cced8b854cadf9..2fd6dd667a3cc1c2dfb0415f899479ce20421113 100644
--- a/src/main/java/no/bioforsk/vips/util/WeatherElements.java
+++ b/src/main/java/no/bioforsk/vips/util/WeatherElements.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/util/WeatherObservationListException.java b/src/main/java/no/bioforsk/vips/util/WeatherObservationListException.java
index 979386e5bc5006d8f46b806b9e9ce754f2bb1bad..8646acae5f2d636b4209646bba25bd70f12a6de5 100644
--- a/src/main/java/no/bioforsk/vips/util/WeatherObservationListException.java
+++ b/src/main/java/no/bioforsk/vips/util/WeatherObservationListException.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/util/WeatherUtil.java b/src/main/java/no/bioforsk/vips/util/WeatherUtil.java
index c2fa7642c906949b550820150ccf07b23ef42626..e44152a111f597f2a9a2939e34b9a6d585656cf2 100644
--- a/src/main/java/no/bioforsk/vips/util/WeatherUtil.java
+++ b/src/main/java/no/bioforsk/vips/util/WeatherUtil.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/util/WebUtil.java b/src/main/java/no/bioforsk/vips/util/WebUtil.java
index ef5d23e396c272241bf28cca41c03289591b16a2..29fed4ca861a69b9ff328a178c91dfd3ef753a6e 100644
--- a/src/main/java/no/bioforsk/vips/util/WebUtil.java
+++ b/src/main/java/no/bioforsk/vips/util/WebUtil.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/test/java/no/bioforsk/vips/common/AppTest.java b/src/test/java/no/bioforsk/vips/common/AppTest.java
index 42723ebf0d8bbbe98325f24f7d8f146cdf676abe..caf7a313e1f6d1d0505d15743d9de6fc5dc35c0a 100644
--- a/src/test/java/no/bioforsk/vips/common/AppTest.java
+++ b/src/test/java/no/bioforsk/vips/common/AppTest.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/test/java/no/bioforsk/vips/util/WeatherUtilTest.java b/src/test/java/no/bioforsk/vips/util/WeatherUtilTest.java
index 2a566926b1aa6b6f4fa5340b4c91472c1e26cf14..2a372038ff94e56eab9c72f15539d70c0fac2990 100644
--- a/src/test/java/no/bioforsk/vips/util/WeatherUtilTest.java
+++ b/src/test/java/no/bioforsk/vips/util/WeatherUtilTest.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCommon.
  * VIPSCommon 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.
  * 
  * VIPSCommon 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 VIPSCommon.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCommon.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */