From 03c73a6d2443a27a56eae48f6c65b2956a17963c Mon Sep 17 00:00:00 2001 From: lewa <lene.wasskog@nibio.no> Date: Fri, 15 Sep 2023 09:38:53 +0200 Subject: [PATCH] chore: Remove ci_settings.xml, update pom + README --- .gitignore | 1 + README.md | 12 ++++++++++++ ci_settings.xml | 16 ---------------- pom.xml | 27 +++++++++++---------------- 4 files changed, 24 insertions(+), 32 deletions(-) create mode 100644 README.md delete mode 100644 ci_settings.xml diff --git a/.gitignore b/.gitignore index 23176e3..7f86821 100755 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ target/ classes/ +.idea/ diff --git a/README.md b/README.md new file mode 100644 index 0000000..0c254ff --- /dev/null +++ b/README.md @@ -0,0 +1,12 @@ +# DOWNCASTModel + +This repository contains the implementation of the DOWNCAST model. + +### Development + +Clone Gitlab repository + +``` +$ git clone https://gitlab.nibio.no/VIPS/models/java/Model_DOWNCASTMO.git +$ cd Model_DOWNCASTMO +``` diff --git a/ci_settings.xml b/ci_settings.xml deleted file mode 100644 index fbe7a8c..0000000 --- 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 6489c9c..b11a550 100755 --- a/pom.xml +++ b/pom.xml @@ -1,28 +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> - <groupId>no.nibio.vips.model</groupId> - <artifactId>DOWNCASTModel</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>DOWNCASTModel</artifactId> + <version>2.0.0</version> + <packaging>jar</packaging> + <dependencies> <dependency> <groupId>no.nibio.vips</groupId> <artifactId>VIPSCommon</artifactId> - <version>2.0.12</version> + <version>0.0.4</version> </dependency> <dependency> <groupId>junit</groupId> @@ -38,7 +34,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> -- GitLab