diff --git a/README.md b/README.md index ab933b21d1bd8fb89cf6566d89802ff626669160..a385f8eff80694e480f0279138cf9036ebae9903 100644 --- a/README.md +++ b/README.md @@ -7,4 +7,13 @@ Read more about the model here: https://www.vips-landbruk.no/forecasts/models/NA It is designed to run inside the [VIPSCore system](https://gitlab.nibio.no/VIPS/VIPSCore) -License: [NIBIO Open Source License](https://nibio.no/licenses) \ No newline at end of file +License: [NIBIO Open Source License](https://nibio.no/licenses) + +### Development + +Clone Gitlab repository + +``` +$ git clone https://gitlab.nibio.no/VIPS/models/java/Model_NAERSTADMO.git +$ cd Model_NAERSTADMO +``` \ 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 720c9d864022e93a3c927a197ed86a4647e734cd..8152efc04b3bfe0fe3b225a032a0a902e2181be7 100755 --- a/pom.xml +++ b/pom.xml @@ -1,28 +1,43 @@ <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> + 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>NaerstadModel</artifactId> - <version>2.0.0</version> - <packaging>jar</packaging> - - <name>NaerstadModel</name> - - <parent> + <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> - - <url>http://maven.apache.org</url> + + <groupId>no.nibio.vips.model</groupId> + <artifactId>NaerstadModel</artifactId> + <version>2.0.0</version> + <packaging>jar</packaging> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>2.4.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.4.1</version> + </dependency> + <dependency> + <groupId>no.nibio.vips</groupId> + <artifactId>VIPSCommon</artifactId> + <version>0.0.4</version> + </dependency> + </dependencies> + <build> <plugins> <plugin> @@ -36,32 +51,5 @@ </plugin> </plugins> </build> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>2.4.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>2.4.1</version> - </dependency> - <dependency> - <groupId>no.nibio.vips</groupId> - <artifactId>VIPSCommon</artifactId> - <version>2.0.12</version> - </dependency> - </dependencies> </project>