diff --git a/.gitignore b/.gitignore index 23176e3effbf3094ff070c26224e3b2d14427283..77ec16090557fda260a461885bc1ea88806420c8 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 index c929f114459e030b10fb4f133a95dbbda252c413..508e1a4cf62acea986cd7aefe51ab6627d48cee2 100644 --- a/README.md +++ b/README.md @@ -13,3 +13,12 @@ These must be considered proofs-of-concept and starting points for anyone who wishes to implement VIPS models using JavaScript (for whatever reason!). Please note that **you still have to write some Java code**. The JavaScript files are found in `src/main/resources/js`. + +### Development + +Clone Gitlab repository + +``` +$ git clone https://gitlab.nibio.no/VIPS/models/java/model_fawmodel01.git +$ cd model_fawmodel01 +``` \ 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 dd0b9230791fa9c75a0b18800339f2df74fb155f..f67742aab4016f8083a6b09676337c6fa674dd53 100644 --- 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>nio.nibio.vips.model</groupId> <artifactId>FallArmywormModel</artifactId> <version>1.0.1</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.12</version> + <version>0.0.4</version> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> @@ -40,30 +38,26 @@ <version>5.3.1</version> <scope>test</scope> </dependency> - - - <dependency> - <groupId>org.graalvm.js</groupId> - <artifactId>js</artifactId> - <version>1.0.0-rc16</version> - </dependency> - <dependency> - <groupId>org.graalvm.js</groupId> - <artifactId>js-scriptengine</artifactId> - <version>1.0.0-rc16</version> - </dependency> - <dependency> - <groupId>org.graalvm.truffle</groupId> - <artifactId>truffle-api</artifactId> - <version>1.0.0-rc16</version> - </dependency> - <dependency> - <groupId>com.eclipsesource.j2v8</groupId> - <artifactId>j2v8_linux_x86_64</artifactId> - <version>4.8.0</version> - </dependency> - - + <dependency> + <groupId>org.graalvm.js</groupId> + <artifactId>js</artifactId> + <version>1.0.0-rc16</version> + </dependency> + <dependency> + <groupId>org.graalvm.js</groupId> + <artifactId>js-scriptengine</artifactId> + <version>1.0.0-rc16</version> + </dependency> + <dependency> + <groupId>org.graalvm.truffle</groupId> + <artifactId>truffle-api</artifactId> + <version>1.0.0-rc16</version> + </dependency> + <dependency> + <groupId>com.eclipsesource.j2v8</groupId> + <artifactId>j2v8_linux_x86_64</artifactId> + <version>4.8.0</version> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -77,7 +71,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>