diff --git a/.gitignore b/.gitignore index 4bc1e934d1a2494c4b7a08a7b94ce0c6f5834c65..a3d4ddf2b18c8a2268feac9773c8d17a939902af 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 0000000000000000000000000000000000000000..f82a863a855fcd10c1c7906f1d556202c81c6bfc --- /dev/null +++ b/README.md @@ -0,0 +1,12 @@ +# GrassDryingModel + +This repository contains the implementation of the Grass drying model. + +### Development + +Clone Gitlab repository + +``` +$ git clone https://gitlab.nibio.no/VIPS/models/java/Model_GRASSDRYMO.git +$ cd Model_GRASSDRYMO +``` 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 b3eeabc21d1da4b9da418af8713890f5d65a187a..d55ca785959432e08d7c45c03e1cd598132648d2 100755 --- a/pom.xml +++ b/pom.xml @@ -1,30 +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.vips</groupId> - <artifactId>GrassDryingModel</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.vips.model</groupId> + <artifactId>GrassDryingModel</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>jar</packaging> <dependencies> <dependency> <groupId>no.nibio.vips</groupId> <artifactId>VIPSCommon</artifactId> - <version>2.0.2</version> - <scope>provided</scope> + <version>0.0.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -45,7 +38,6 @@ </dependency> </dependencies> <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.target>1.7</maven.compiler.target> </properties>