Merge pull request #16 from 3D-e-Chem/knime51

Support KNIME 5.1

.github/workflows/build.yml

@@ -1,29 +1,25 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Package
+name: Java CI with Maven
 
 on:
   push:
+    branches:
+      - master
   pull_request:
-    types:
-      - "opened"
-      - "reopened"
+    types: [opened, synchronize, reopened]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
       with:
-        java-version: 1.8
-    - name: Cache Maven packages
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml', '**/MANIFEST.MF', 'targetplatform/*.target') }}
-        restore-keys: ${{ runner.os }}-m2
+        java-version: 17
+        distribution: 'temurin'
+        cache: maven
     - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      run: mvn -B verify

.mvn/extensions.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions>
+    <extension>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-build</artifactId>
+        <version>2.7.5</version>
+    </extension>
+</extensions>

README.md

@@ -12,7 +12,7 @@ This project uses [Eclipse Tycho](https://www.eclipse.org/tycho/) to perform bui
 
 Requirements:
 
-- KNIME, https://www.knime.org, version 4.3 or higher
+* KNIME, https://www.knime.org, version 5.1 or higher
 
 Steps to get the 3D-e-Chem nodes inside KNIME:
 
@@ -28,7 +28,7 @@ Some nodes need Python packages, those nodes have install instructions in their
 
 Each KNIME node developed in the 3D-e-Chem project has it own Github repository, Eclipse feature and Eclipse plugin.
 
-The update site `https://3d-e-chem.github.io/updates` contains the Eclipse features of all the 3D-e-Chem developed nodes.
+The update site `https://3d-e-chem.github.io/updates/5.1` contains the Eclipse features of all the 3D-e-Chem developed nodes.
 When using this update site in KNIME, it will list all the nodes by their repository.
 
 This update site `https://3d-e-chem.github.io/knime-node-collection` contains a single Eclipse feature which combines all the 3D-e-Chem developed nodes.
@@ -46,7 +46,7 @@ Pros of using this repo:
 - Single checkbox to install all 3D-e-Chem nodes
 - Integrated into KNIME Community Contributions update site under `KNIME Community nodes - Cheminformatics` folder. Users do not need to configure an extra update site.
 
-So to have the latest version of each node you should use `https://3d-e-chem.github.io/updates`, but for stable releases use `https://3d-e-chem.github.io/knime-node-collection`.
+So to have the latest version of each node you should use `https://3d-e-chem.github.io/updates/5.1`, but for stable releases use `https://3d-e-chem.github.io/knime-node-collection`.
 
 # Adding a new KNIME node
 
@@ -70,11 +70,11 @@ The update site can be used to perform a local installation.
 
 Steps to get development environment setup based on https://github.com/knime/knime-sdk-setup#sdk-setup:
 
-1. Install Java 8
-2. Install Eclipse for [RCP and RAP developers](https://www.eclipse.org/downloads/packages/release/2018-12/r/eclipse-ide-rcp-and-rap-developers)
-3. Configure Java 8 inside Eclipse Window > Preferences > Java > Installed JREs
+1. Install Java 17
+2. Install Eclipse for [RCP and RAP developers](https://www.eclipse.org/downloads/packages/installer)
+3. Configure Java 17 inside Eclipse Window > Preferences > Java > Installed JREs
 4. Import this repo as an Existing Maven project
-5. Add http://update.knime.org/analytics-platform/4.0 and https://3d-e-chem.github.io/updates to list of update sites
+5. Add http://update.knime.org/analytics-platform/5.1 and https://3d-e-chem.github.io/updates/5.1 to list of update sites
 
 During import the Tycho Eclipse providers must be installed.
 

feature/feature.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="nl.esciencecenter.e3dchem.collection.feature" label="3D-e-Chem KNIME nodes" version="1.6.0.qualifier" provider-name="Netherlands eScience Center &amp; Division of Medicinal Chemistry - VU University Amsterdam &amp; CMBI Radboud University" plugin="nl.esciencecenter.e3dchem.plugin" os="linux,macosx,win32" arch="x86_64,x86">
+<feature id="nl.esciencecenter.e3dchem.collection.feature" label="3D-e-Chem KNIME nodes" version="1.7.0.qualifier" provider-name="Netherlands eScience Center &amp; Division of Medicinal Chemistry - VU University Amsterdam &amp; CMBI Radboud University" plugin="nl.esciencecenter.e3dchem.plugin">
 
   <description url="https://3d-e-chem.github.io">
       Collection of 3D-e-Chem KNIME nodes. Nodes build for 3D-e-Chem project (https://3d-e-chem.github.io/).
@@ -693,11 +693,6 @@ Public License instead of this License.  But first, please read
 &lt;http://www.gnu.org/philosophy/why-not-lgpl.html&gt;.
   </license>
 
-  <url>
-    <update label="Update site" url="https://3d-e-chem.github.io/updates"/>
-    <discovery label="Discovery site" url="https://3d-e-chem.github.io"/>
-  </url>
-
   <plugin id="nl.esciencecenter.e3dchem.knime.pharmacophore.plugin" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
   <plugin id="nl.esciencecenter.e3dchem.gpcrdb" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
@@ -718,12 +713,8 @@ Public License instead of this License.  But first, please read
 
   <plugin id="nl.esciencecenter.e3dchem.knime.plants.plugin" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
-  <plugin id="nl.esciencecenter.e3dchem.python.plugin" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-
   <plugin id="nl.esciencecenter.e3dchem.plugin" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
-  <plugin id="nl.esciencecenter.e3dchem.knime.molviewer.server" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-
   <plugin id="nl.esciencecenter.e3dchem.knime.plants.bin.linux" os="linux" arch="x86_64" download-size="0" install-size="0" version="0.0.0" fragment="true"/>
 
   <plugin id="nl.esciencecenter.e3dchem.knime.plants.bin.macosx" os="macosx" arch="x86_64" download-size="0" install-size="0" version="0.0.0" fragment="true"/>

feature/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>nl.esciencecenter.e3dchem.collection</groupId>
 		<artifactId>nl.esciencecenter.e3dchem.collection</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
+		<version>1.7.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>nl.esciencecenter.e3dchem.collection.feature</artifactId>

p2/category.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-	<feature url="features/nl.esciencecenter.e3dchem.collection.feature-1.6.0.qualifier.jar"
-		id="nl.esciencecenter.e3dchem.collection.feature" version="1.6.0.qualifier">
+	<feature url="features/nl.esciencecenter.e3dchem.collection.feature-1.7.0.qualifier.jar"
+		id="nl.esciencecenter.e3dchem.collection.feature" version="1.7.0.qualifier">
 		<category name="org.knime.community.build.config/category.xml.cheminf" />
 	</feature>
 	<category-def name="org.knime.community.build.config/category.xml.cheminf" label="KNIME Community Contributions - Cheminformatics">

p2/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>nl.esciencecenter.e3dchem.collection</artifactId>
 		<groupId>nl.esciencecenter.e3dchem.collection</groupId>
-		<version>1.6.0-SNAPSHOT</version>
+		<version>1.7.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>nl.esciencecenter.e3dchem.collection.p2</artifactId>
 	<packaging>eclipse-repository</packaging>
@@ -28,7 +28,7 @@
 									<url>${project.build.directory}/repository</url>
 								</repository>
 							</source>
-							<destination>../docs/4.3</destination>
+							<destination>../docs/5.1</destination>
 							<name>3D-e-Chem KNIME node collection</name>
 							<xzCompress>true</xzCompress>
 						</configuration>

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>nl.esciencecenter.e3dchem.collection</groupId>
 	<artifactId>nl.esciencecenter.e3dchem.collection</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
+	<version>1.7.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<scm>
@@ -18,21 +18,23 @@
 		<url>https://github.com/3D-e-Chem/knime-node-collection/issues</url>
 	</issueManagement>
 	<ciManagement>
-		<system>Travis CI</system>
-		<url>http://travis-ci.org/3D-e-Chem/knime-node-collection</url>
+		<system>GitHub</system>
+		<url>https://github.com/3D-e-Chem/knime-node-collection/actions</url>
 	</ciManagement>
 
 	<prerequisites>
 		<maven>3.0</maven>
 	</prerequisites>
 
 	<properties>
-		<knime.version>4.3</knime.version>
+		<knime.version>5.1</knime.version>
 		<knime.update.site>http://update.knime.org/analytics-platform/${knime.version}/</knime.update.site>
 		<knime.community.trusted.update.site>http://update.knime.org/community-contributions/trusted/${knime.version}/</knime.community.trusted.update.site>
-		<tycho.version>1.4.0</tycho.version>
-		<tycho.extras.version>1.4.0</tycho.extras.version>
+		<tycho.version>2.7.5</tycho.version>
+		<tycho.extras.version>${tycho.version}</tycho.extras.version>
 		<tycho.test.jvmArgs>-Xmx512m</tycho.test.jvmArgs>
+		<java.version>17</java.version>
+		<maven.compiler.version>3.10.1</maven.compiler.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<tycho.scmUrl>scm:git:https://github.com/3D-e-Chem/knime-node-collection.git</tycho.scmUrl>
@@ -52,7 +54,7 @@
 		<repository>
 			<id>3d-e-chem</id>
 			<layout>p2</layout>
-			<url>https://3d-e-chem.github.io/updates</url>
+			<url>https://3d-e-chem.github.io/updates/5.1</url>
 		</repository>
 	</repositories>
 	<build>
@@ -113,11 +115,6 @@
                     </execution>
                 </executions>
             </plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-pack200a-plugin</artifactId>
-				<version>${tycho.extras.version}</version>
-			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>