Skip to content
Snippets Groups Projects
Commit 23130c32 authored by Lene Wasskog's avatar Lene Wasskog
Browse files

Merge branch 'main' into release

parents 67efc984 20c854cf
Branches
Tags
No related merge requests found
Pipeline #2024 passed
target/ target/
classes/ classes/
.idea/
\ No newline at end of file
...@@ -13,3 +13,12 @@ These must be considered proofs-of-concept and starting points for anyone who ...@@ -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 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 note that **you still have to write some Java code**. The JavaScript files are
found in `src/main/resources/js`. 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
<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>
<?xml version="1.0" encoding="UTF-8"?> <?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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>no.nibio.vips</groupId> <groupId>no.nibio.vips</groupId>
<artifactId>vips-parent-pom</artifactId> <artifactId>vips-parent-pom</artifactId>
<version>1.0.2</version> <version>1.0.0</version>
</parent> </parent>
<groupId>nio.nibio.vips.model</groupId> <groupId>nio.nibio.vips.model</groupId>
<artifactId>FallArmywormModel</artifactId> <artifactId>FallArmywormModel</artifactId>
<version>1.0.1</version> <version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<repositories>
<repository>
<id>gitlab-maven</id>
<url>https://gitlab.nibio.no/api/v4/projects/401/packages/maven</url>
</repository>
</repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>no.nibio.vips</groupId> <groupId>no.nibio.vips</groupId>
<artifactId>VIPSCommon</artifactId> <artifactId>VIPSCommon</artifactId>
<version>2.0.1</version> <version>0.0.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
...@@ -40,30 +38,26 @@ ...@@ -40,30 +38,26 @@
<version>5.3.1</version> <version>5.3.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.graalvm.js</groupId>
<dependency> <artifactId>js</artifactId>
<groupId>org.graalvm.js</groupId> <version>1.0.0-rc16</version>
<artifactId>js</artifactId> </dependency>
<version>1.0.0-rc16</version> <dependency>
</dependency> <groupId>org.graalvm.js</groupId>
<dependency> <artifactId>js-scriptengine</artifactId>
<groupId>org.graalvm.js</groupId> <version>1.0.0-rc16</version>
<artifactId>js-scriptengine</artifactId> </dependency>
<version>1.0.0-rc16</version> <dependency>
</dependency> <groupId>org.graalvm.truffle</groupId>
<dependency> <artifactId>truffle-api</artifactId>
<groupId>org.graalvm.truffle</groupId> <version>1.0.0-rc16</version>
<artifactId>truffle-api</artifactId> </dependency>
<version>1.0.0-rc16</version> <dependency>
</dependency> <groupId>com.eclipsesource.j2v8</groupId>
<dependency> <artifactId>j2v8_linux_x86_64</artifactId>
<groupId>com.eclipsesource.j2v8</groupId> <version>4.8.0</version>
<artifactId>j2v8_linux_x86_64</artifactId> </dependency>
<version>4.8.0</version>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
...@@ -77,7 +71,6 @@ ...@@ -77,7 +71,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
</properties> </properties>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment