From 52c2ca3687835201e51a2f703fbd3899551782eb Mon Sep 17 00:00:00 2001
From: lewa <lene.wasskog@nibio.no>
Date: Fri, 15 Sep 2023 09:44:19 +0200
Subject: [PATCH] chore: Remove ci_settings.xml, update pom + README
---
README.md | 9 ++++++++-
ci_settings.xml | 16 ----------------
pom.xml | 13 +++++--------
3 files changed, 13 insertions(+), 25 deletions(-)
delete mode 100644 ci_settings.xml
diff --git a/README.md b/README.md
index 1147a73..bb83410 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
# Finn Cereal Models
**Model for net blotch (Pyrenophora teres), tan spot (pyrenophora triciti-repentis), and stagonospora blotch (s. nodorum)**
-
This is a mechanistic model that can be used for three fungal diseases in cereals: the barley net
blotch caused by *Pyrenophora teres*, the wheat tan spot caused by *Pyrenophora triciti-repentis*,
and the wheat stagonospora blotch caused by *S. nodorum*.
@@ -48,3 +47,11 @@ University of Eastern Finland. Dissertations in Forestry and Natural
Sciences No 192, University of Eastern Finland. ISBN:
978-952-61-1907-6. http://urn.fi/URN:ISBN:978-952-61-1908-3
+### Development
+
+Clone Gitlab repository
+
+```
+$ git clone https://gitlab.nibio.no/VIPS/models/java/Model_FINNCEREAL.git
+$ cd Model_FINNCEREAL
+```
diff --git a/ci_settings.xml b/ci_settings.xml
deleted file mode 100644
index da49fc0..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>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 65003e7..80bd3c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,20 +1,17 @@
<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>fi.luke.vips.model</groupId>
<artifactId>FinnCerealModels</artifactId>
<version>1.0.0</version>
- <repositories>
- <repository>
- <id>gitlab-maven</id>
- <url>https://gitlab.nibio.no/api/v4/projects/401/packages/maven</url>
- </repository>
- </repositories>
+
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
@@ -45,7 +42,7 @@
<dependency>
<groupId>no.nibio.vips</groupId>
<artifactId>VIPSCommon</artifactId>
- <version>2.0.12</version>
+ <version>0.0.4</version>
</dependency>
</dependencies>
</project>
--
GitLab