Merge branch 'main' into release

.gitignore

 target/
 classes/
+.idea/
\ No newline at end of file

README.md

+# PsilaRosaeObservationModel
+
+This repository contains the implementation of the Carrot rust fly (Psila rosae) observation model.
+
+### Development
+
+Clone Gitlab repository
+
+```
+$ git clone https://gitlab.nibio.no/VIPS/models/java/Model_PSILAROBSE.git
+$ cd Model_PSILAROBSE
+```
\ No newline at end of file

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

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>no.nibio.vips.model</groupId>
-    <artifactId>PsilaRosaeObservationModel</artifactId>
-    <version>2.0.0</version>
-    <packaging>jar</packaging>
-    
+
     <parent>
         <groupId>no.nibio.vips</groupId>
         <artifactId>vips-parent-pom</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.0</version>
     </parent>
-    <repositories>
-        <repository>
-            <id>gitlab-maven</id>
-            <url>https://gitlab.nibio.no/api/v4/projects/401/packages/maven</url>
-        </repository>
-    </repositories>
+
+    <groupId>no.nibio.vips.model</groupId>
+    <artifactId>PsilaRosaeObservationModel</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
     <dependencies>
         <dependency>
             <groupId>no.nibio.vips</groupId>
             <artifactId>VIPSCommon</artifactId>
-            <version>2.0.2</version>
+            <version>0.0.4</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -37,7 +34,6 @@
         </dependency>
     </dependencies>
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
     </properties>