diff --git a/README.md b/README.md index 65f208363e550706b67b68c5309c1e6c573cee9f..0047920b191755e6c5bb35ad964818ca62ee6abf 100755 --- a/README.md +++ b/README.md @@ -1 +1,12 @@ -Common codebase for the Delia radicum and floralis observation model for new and old crops \ No newline at end of file +# DeliaRadicumFloralisObservationModel + +This repository contains the common codebase for the Delia radicum and floralis observation model for new and old crops + +### Development + +Clone Gitlab repository + +``` +$ git clone https://gitlab.nibio.no/VIPS/models/java/Model_DELIARFOBS.git +$ cd Model_DELIARFOBS +``` diff --git a/ci_settings.xml b/ci_settings.xml deleted file mode 100644 index da49fc0ffec4b5da556e6482d8f903129998bd81..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 b1c48cd6fd357bf57bf98e213319a4c7a05382b3..38d53dcc70df5c69e62680fd05542e34454920ea 100755 --- a/pom.xml +++ b/pom.xml @@ -1,26 +1,24 @@ <?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"> +<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> + <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>DeliaRadicumFloralisObservationModel</artifactId> - <version>1.0.0</version> + <version>1.1.0-SNAPSHOT</version> <packaging>jar</packaging> - <repositories> - <repository> - <id>gitlab-maven</id> - <url>https://gitlab.nibio.no/api/v4/projects/401/packages/maven</url> - </repository> - </repositories> + <dependencies> <dependency> <groupId>no.nibio.vips</groupId> <artifactId>VIPSCommon</artifactId> - <version>2.0.2</version> + <version>0.0.4</version> </dependency> <dependency> <groupId>junit</groupId>