diff --git a/README.md b/README.md index f0bd87193657f0152b33184b12e15311be33d6f8..bb57bef3e70bbaea9467c7d32c017d3317de671f 100644 --- a/README.md +++ b/README.md @@ -165,4 +165,13 @@ "allValues": "{\"WEATHER.TX\":\"37.33\",\"MAIZEPHENO.HEAT_SUM\":\"313.47\",\"MAIZEPHENO.DC\":\"16.3\",\"WEATHER.TN\":\"15.26\",\"MAIZEPHENO.PHASE\":\"V7-V9\"}", "keys": "[\"WEATHER.TX\",\"MAIZEPHENO.HEAT_SUM\",\"MAIZEPHENO.DC\",\"WEATHER.TN\",\"MAIZEPHENO.PHASE\"]" }] +``` + +### Development + +Clone Gitlab repository + +``` +$ git clone https://gitlab.nibio.no/VIPS/models/java/model_maizepheno.git +$ cd model_maizepheno ``` \ No newline at end of file diff --git a/ci_settings.xml b/ci_settings.xml deleted file mode 100644 index fbe7a8cc673f260da37d0771ee646fd1360370b8..0000000000000000000000000000000000000000 --- 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 79787e55289b90f69822b0a6c6dc70bc42d7ecb3..f042c31239354f0ea543e2a5762972552246c3cf 100644 --- a/pom.xml +++ b/pom.xml @@ -1,29 +1,23 @@ <?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"> <modelVersion>4.0.0</modelVersion> - <groupId>no.nibio.model</groupId> - <artifactId>Model_MAIZEPHENO</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.model</groupId> + <artifactId>Model_MAIZEPHENO</artifactId> + <version>2.0.0</version> + <packaging>jar</packaging> + <dependencies> <dependency> <groupId>no.nibio.vips</groupId> <artifactId>VIPSCommon</artifactId> - <version>2.0.12</version> + <version>0.0.4</version> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> @@ -45,7 +39,6 @@ </dependency> </dependencies> <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> </properties>