Merge branch 'main' into release

pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>no.nibio.vips</groupId>
         <artifactId>vips-parent-pom</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
     </parent>
 
     <groupId>no.nibio.vips.model</groupId>
     <artifactId>NaerstadModel</artifactId>
-    <version>1.1.6</version>
+    <version>1.1.7-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>