diff --git a/.gitignore b/.gitignore index 7a03f2e8852777aa499889951a5d5d8b610df740..e2f6b2df6120694e0014e3b56ef401840854100f 100755 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ target/ classes/ modules/ *~ +.idea/ \ 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 a3fe85eadaf98087c15b61dc7192e768876af9fd..3728e88bd3bbc94e34dbe43da5466587c52f0e4b 100755 --- a/pom.xml +++ b/pom.xml @@ -1,27 +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> + <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>RoughageNutritionModel</artifactId> - <version>1.0.1</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> - <type>jar</type> + <version>0.0.4</version> </dependency> <dependency> <groupId>commons-math</groupId> @@ -37,7 +33,6 @@ </dependency> </dependencies> <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> </properties>