From ab47a76660dc89b28eb54fce0837d61ee7195cd9 Mon Sep 17 00:00:00 2001
From: lewa <lene.wasskog@nibio.no>
Date: Fri, 15 Sep 2023 09:19:00 +0200
Subject: [PATCH] chore: Remove ci_settings.xml, update pom + README
---
.gitignore | 1 +
README.md | 12 ++++++++++++
ci_settings.xml | 16 ----------------
pom.xml | 18 +++++++-----------
4 files changed, 20 insertions(+), 27 deletions(-)
create mode 100644 README.md
delete mode 100644 ci_settings.xml
diff --git a/.gitignore b/.gitignore
index 4bc1e93..a3d4ddf 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
target/
classes/
*~
+.idea/
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..0160c9f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,12 @@
+# DeliaRadicumModel
+
+This repository contains the implementation of the Cabbage maggot flight period model.
+
+### Development
+
+Clone Gitlab repository
+
+```
+$ git clone https://gitlab.nibio.no/VIPS/models/java/Model_DELIARADIC.git
+$ cd Model_DELIARADIC
+```
\ No newline at end of file
diff --git a/ci_settings.xml b/ci_settings.xml
deleted file mode 100644
index 57951e9..0000000
--- a/ci_settings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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>
diff --git a/pom.xml b/pom.xml
index 9ef30c7..fc51466 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,28 +1,25 @@
<?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>
+
<parent>
<groupId>no.nibio.vips</groupId>
<artifactId>vips-parent-pom</artifactId>
- <version>1.0.2</version>
+ <version>1.0.0</version>
</parent>
+
<groupId>no.nibio.vips</groupId>
<artifactId>DeliaRadicumModel</artifactId>
<version>1.0.1</version>
<packaging>jar</packaging>
- <repositories>
- <repository>
- <id>gitlab-maven</id>
- <url>https://gitlab.nibio.no/api/v4/projects/401/packages/maven</url>
- </repository>
- </repositories>
+
<dependencies>
<dependency>
<groupId>no.nibio.vips</groupId>
<artifactId>VIPSCommon</artifactId>
- <version>2.0.12</version>
+ <version>0.0.4</version>
<type>jar</type>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -32,7 +29,6 @@
</dependency>
</dependencies>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>10</maven.compiler.source>
<maven.compiler.target>10</maven.compiler.target>
</properties>
--
GitLab