diff --git a/.gitignore b/.gitignore index 23176e3effbf3094ff070c26224e3b2d14427283..c8f1926bd3d293a85a926f13f4e78448b9d996e7 100755 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ target/ classes/ +.idea \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000000000000000000000000000000000000..ed271f677cfc7606f32ec5bf7475fb954f06991c --- /dev/null +++ b/README.md @@ -0,0 +1,12 @@ +# AppleScabModel + +This repository contains the implementation of the Apple Scab Model. + +### Development + +Clone Gitlab repository + +``` +$ git clone https://gitlab.nibio.no/VIPS/models/java/Model_APPLESCABM.git +$ cd Model_APPLESCABM +``` \ No newline at end of file diff --git a/ci_settings.xml b/ci_settings.xml deleted file mode 100644 index 57951e92f75c86876e49eca1e23eaeb10eb80e62..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> diff --git a/pom.xml b/pom.xml index 7f25c2fda4c5dd6454fe003deb0d75e6b742fe07..e09b34e1f3fc89fe36fbdf23e8a296e16e9a788b 100755 --- a/pom.xml +++ b/pom.xml @@ -1,19 +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> - <parent> + <parent> <groupId>no.nibio.vips</groupId> <artifactId>vips-parent-pom</artifactId> - <version>1.0.2</version> + <version>1.0.0</version> </parent> - <groupId>no.nibio.vips.model</groupId> - <artifactId>AppleScabModel</artifactId> - <version>1.0.1</version> - <packaging>jar</packaging> - <name>AppleScabModel</name> - <url>http://maven.apache.org</url> + <groupId>no.nibio.vips.model</groupId> + <artifactId>AppleScabModel</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>jar</packaging> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>no.nibio.vips</groupId> + <artifactId>VIPSCommon</artifactId> + <version>0.0.4</version> + <scope>provided</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> + </dependencies> <build> <plugins> <plugin> @@ -27,35 +51,4 @@ </plugin> </plugins> </build> - <repositories> - <repository> - <id>gitlab-maven</id> - <url>https://gitlab.nibio.no/api/v4/projects/401/packages/maven</url> - </repository> - </repositories> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>no.nibio.vips</groupId> - <artifactId>VIPSCommon</artifactId> - <version>2.0.1</version> - <scope>provided</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> - </dependencies> </project>