Merge branch 'main' into release

.gitignore

@@ -4,3 +4,4 @@ jbossmodule/
 /nbproject/
 *~
 .idea/
+/VIPSCommon.iml

README.md

@@ -3,7 +3,8 @@
 This is a jar file that contains the entities and util classes that are used throughout the VIPS system
 
 ## Requirements
-* Java >= 14 
-
+* Java >= 14
+* 
 ## Development
 
+

ci_settings.xml

-<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
-    <servers>
-        <server>
-            <id>gitlab-maven</id>
-            <configuration>
-                <httpHeaders>
-                    <property>
-                        <name>Job-Token</name>
-                        <value>${CI_JOB_TOKEN}</value>
-                    </property>
-                </httpHeaders>
-            </configuration>
-        </server>
-    </servers>
-</settings>
\ No newline at end of file

pom.xml

@@ -5,22 +5,16 @@
     <parent>
         <groupId>no.nibio.vips</groupId>
         <artifactId>vips-parent-pom</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.7</version>
     </parent>
 
-    <groupId>no.nibio.vips</groupId>
     <artifactId>VIPSCommon</artifactId>
-    <version>2.0.12</version>
+    <version>2.0.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>VIPSCommon</name>
     <url>https://gitlab.nibio.no/VIPS/VIPSCommon</url>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -153,10 +147,6 @@
         </dependency>
     </dependencies>
     <repositories>
-        <repository>
-            <id>gitlab-maven</id>
-            <url>https://gitlab.nibio.no/api/v4/projects/401/packages/maven</url>
-        </repository>
         <repository>
             <id>bedatadriven</id>
             <name>bedatadriven public repo</name>