Skip to content
Snippets Groups Projects
Commit 52ae7135 authored by Lene Wasskog's avatar Lene Wasskog
Browse files

Merge branch 'main' into release

parents 64209b73 600b8304
No related branches found
No related tags found
No related merge requests found
Pipeline #2007 passed
Stage: build
Stage: test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
README.md
+ 10
− 1
View file @ 52ae7135
...@@ -7,4 +7,13 @@ Read more about the model here: https://www.vips-landbruk.no/forecasts/models/NA ...@@ -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) It is designed to run inside the [VIPSCore system](https://gitlab.nibio.no/VIPS/VIPSCore)
License: [NIBIO Open Source License](https://nibio.no/licenses) License: [NIBIO Open Source License](https://nibio.no/licenses)
\ No newline at end of file
### 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
ci_settings.xml deleted 100644 → 0
+ 0
− 16
View file @ 64209b73
<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
+ 35
− 47
View file @ 52ae7135
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> 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> <modelVersion>4.0.0</modelVersion>
<groupId>no.nibio.vips.model</groupId> <parent>
<artifactId>NaerstadModel</artifactId>
<version>2.0.0</version>
<packaging>jar</packaging>
<name>NaerstadModel</name>
<parent>
<groupId>no.nibio.vips</groupId> <groupId>no.nibio.vips</groupId>
<artifactId>vips-parent-pom</artifactId> <artifactId>vips-parent-pom</artifactId>
<version>1.0.2</version> <version>1.0.0</version>
</parent> </parent>
<repositories> <groupId>no.nibio.vips.model</groupId>
<repository> <artifactId>NaerstadModel</artifactId>
<id>gitlab-maven</id> <version>1.1.0-SNAPSHOT</version>
<url>https://gitlab.nibio.no/api/v4/projects/401/packages/maven</url> <packaging>jar</packaging>
</repository>
</repositories> <dependencies>
<dependency>
<url>http://maven.apache.org</url> <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> <build>
<plugins> <plugins>
<plugin> <plugin>
...@@ -36,32 +51,5 @@ ...@@ -36,32 +51,5 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </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.2</version>
</dependency>
</dependencies>
</project> </project>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment