Bump to 0.3.3

3D-e-Chem · Nov 8, 2017 · 78af6f9 · 78af6f9
1 parent eca5e59
commit 78af6f9
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ The file is formatted as described on http://keepachangelog.com/.
 
 ## [Unreleased]
 
+## [0.3.3] 2017-11-08
+
+### Fixed
+
+* PLANTS is running in the background after cancellation (#12)
+
 ## [0.3.2] 2017-09-26
 
 ### Added

diff --git a/bin.linux/META-INF/MANIFEST.MF b/bin.linux/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: KNIME nodes for PLANTS, Linux binaries
 Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.plants.bin.linux;singleton:=true
-Bundle-Version: 0.3.2.qualifier
+Bundle-Version: 0.3.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Netherlands eScience Center
 Bundle-ActivationPolicy: lazy

diff --git a/bin.linux/pom.xml b/bin.linux/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>nl.esciencecenter.e3dchem.knime.plants</groupId>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.3.3-SNAPSHOT</version>
     <artifactId>nl.esciencecenter.e3dchem.knime.plants</artifactId>
   </parent>
   <artifactId>nl.esciencecenter.e3dchem.knime.plants.bin.linux</artifactId>

diff --git a/bin.macosx/META-INF/MANIFEST.MF b/bin.macosx/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: KNIME nodes for PLANTS, MacOSX binaries
 Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.plants.bin.macosx;singleton:=true
-Bundle-Version: 0.3.2.qualifier
+Bundle-Version: 0.3.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Netherlands eScience Center
 Bundle-ActivationPolicy: lazy

diff --git a/bin.macosx/pom.xml b/bin.macosx/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>nl.esciencecenter.e3dchem.knime.plants</groupId>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.3.3-SNAPSHOT</version>
     <artifactId>nl.esciencecenter.e3dchem.knime.plants</artifactId>
   </parent>
   <artifactId>nl.esciencecenter.e3dchem.knime.plants.bin.macosx</artifactId>

diff --git a/bin.windows/META-INF/MANIFEST.MF b/bin.windows/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: KNIME nodes for PLANTS, Windows binaries
 Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.plants.bin.windows;singleton:=true
-Bundle-Version: 0.3.2.qualifier
+Bundle-Version: 0.3.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Netherlands eScience Center
 Bundle-ActivationPolicy: lazy

diff --git a/bin.windows/pom.xml b/bin.windows/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>nl.esciencecenter.e3dchem.knime.plants</groupId>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.3.3-SNAPSHOT</version>
     <artifactId>nl.esciencecenter.e3dchem.knime.plants</artifactId>
   </parent>
   <artifactId>nl.esciencecenter.e3dchem.knime.plants.bin.windows</artifactId>

diff --git a/bin.windows32/META-INF/MANIFEST.MF b/bin.windows32/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: KNIME nodes for PLANTS, Windows binaries 32bit
 Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.plants.bin.windows32;singleton:=true
-Bundle-Version: 0.3.2.qualifier
+Bundle-Version: 0.3.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Netherlands eScience Center
 Bundle-ActivationPolicy: lazy

diff --git a/bin.windows32/pom.xml b/bin.windows32/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>nl.esciencecenter.e3dchem.knime.plants</groupId>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.3.3-SNAPSHOT</version>
     <artifactId>nl.esciencecenter.e3dchem.knime.plants</artifactId>
   </parent>
   <artifactId>nl.esciencecenter.e3dchem.knime.plants.bin.windows32</artifactId>

diff --git a/feature/feature.xml b/feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="nl.esciencecenter.e3dchem.knime.plants.feature"
       label="KNIME PLANTS extension"
-      version="0.3.2.qualifier"
+      version="0.3.3.qualifier"
       provider-name="Netherlands eScience Center"
       os="linux,macosx,win32"
       arch="x86,x86_64">

diff --git a/feature/pom.xml b/feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>nl.esciencecenter.e3dchem.knime.plants</groupId>
 		<artifactId>nl.esciencecenter.e3dchem.knime.plants</artifactId>
-		<version>0.3.2-SNAPSHOT</version>
+		<version>0.3.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>nl.esciencecenter.e3dchem.knime.plants.feature</artifactId>

diff --git a/p2/category.xml b/p2/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/nl.esciencecenter.e3dchem.knime.plants.feature-0.3.2.qualifier.jar" id="nl.esciencecenter.e3dchem.knime.plants.feature" version="0.3.2.qualifier">
+   <feature url="features/nl.esciencecenter.e3dchem.knime.plants.feature-0.3.3.qualifier.jar" id="nl.esciencecenter.e3dchem.knime.plants.feature" version="0.3.3.qualifier">
       <category name="nl.esciencecenter.3D-e-Chem"/>
    </feature>
 <category-def name="nl.esciencecenter.3D-e-Chem" label="KNIME 3D-e-Chem Contributions">

diff --git a/p2/pom.xml b/p2/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>nl.esciencecenter.e3dchem.knime.plants</artifactId>
         <groupId>nl.esciencecenter.e3dchem.knime.plants</groupId>
-        <version>0.3.2-SNAPSHOT</version>
+        <version>0.3.3-SNAPSHOT</version>
     </parent>
     <artifactId>nl.esciencecenter.e3dchem.knime.plants.p2</artifactId>
     <packaging>eclipse-repository</packaging>

diff --git a/plugin/META-INF/MANIFEST.MF b/plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: KNIME nodes for PLANTS
 Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.plants.plugin;singleton:=true
-Bundle-Version: 0.3.2.qualifier
+Bundle-Version: 0.3.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: nl.esciencecenter.e3dchem.knime.plants.Activator
 Bundle-Vendor: Netherlands eScience Center

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>nl.esciencecenter.e3dchem.knime.plants</groupId>
 		<artifactId>nl.esciencecenter.e3dchem.knime.plants</artifactId>
-		<version>0.3.2-SNAPSHOT</version>
+		<version>0.3.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>nl.esciencecenter.e3dchem.knime.plants.plugin</artifactId>
 	<packaging>eclipse-plugin</packaging>

diff --git a/plugin/src/main/java/nl/esciencecenter/e3dchem/knime/plants/run/RunNodeModel.java b/plugin/src/main/java/nl/esciencecenter/e3dchem/knime/plants/run/RunNodeModel.java
@@ -59,7 +59,7 @@ protected BufferedDataTable[] execute(BufferedDataTable[] inData, ExecutionConte
             List<String> arguments = StreamSupport.stream(argumentsCell.spliterator(), false)
                     .map(c -> ((StringCell) c).getStringValue()).collect(Collectors.toList());
             File workingDirectory = new File(((StringCell) inRow.getCell(workingDirectoryIndex)).getStringValue());
-            DataRow row = process(inRow.getKey(), workingDirectory, executable, mode, arguments, exec);
+            DataRow row = process(inRow.getKey(), workingDirectory, executable, mode, arguments);
             container.addRowToTable(row);
             exec.checkCanceled();
             exec.setProgress(0.9 * currentRow / rowCount, " processing row " + currentRow);
@@ -72,9 +72,8 @@ protected BufferedDataTable[] execute(BufferedDataTable[] inData, ExecutionConte
         return new BufferedDataTable[] { out };
     }
 
-    public DataRow process(RowKey rowKey, File workingDirectory, String executable, String mode, List<String> arguments,
-            ExecutionContext context)
-            throws IOException, InterruptedException, CanceledExecutionException {
+    public DataRow process(RowKey rowKey, File workingDirectory, String executable, String mode, List<String> arguments)
+            throws IOException, InterruptedException {
         List<String> commands = new ArrayList<>();
         commands.add(executable);
         commands.add("--mode");

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>nl.esciencecenter.e3dchem.knime.plants</groupId>
 	<artifactId>nl.esciencecenter.e3dchem.knime.plants</artifactId>
-	<version>0.3.2-SNAPSHOT</version>
+	<version>0.3.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<scm>

diff --git a/tests/META-INF/MANIFEST.MF b/tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.plants.tests
-Bundle-Version: 0.3.2.qualifier
+Bundle-Version: 0.3.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0",
  org.knime.core;bundle-version="[3.3.0,4.0.0)",

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>nl.esciencecenter.e3dchem.knime.plants</groupId>
 		<artifactId>nl.esciencecenter.e3dchem.knime.plants</artifactId>
-		<version>0.3.2-SNAPSHOT</version>
+		<version>0.3.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>nl.esciencecenter.e3dchem.knime.plants.tests</artifactId>

diff --git a/tests/src/java/nl/esciencecenter/e3dchem/knime/plants/run/RunNodeModelTest.java b/tests/src/java/nl/esciencecenter/e3dchem/knime/plants/run/RunNodeModelTest.java
@@ -15,7 +15,6 @@
 import org.knime.core.data.RowKey;
 import org.knime.core.data.def.DefaultRow;
 import org.knime.core.data.def.IntCell;
-import org.knime.core.node.ExecutionMonitor;
 
 public class RunNodeModelTest {
 	@Rule
@@ -31,10 +30,9 @@ public void testProcess() throws IOException, InterruptedException {
 		String executable = "/bin/echo";
 		String mode = "bind";
 		List<String> arguments = Arrays.asList("arg1", "arg2");
-        ExecutionMonitor context = new ExecutionMonitor();
 
-        DataRow row = node.process(rowKey, workingDirectory, executable, mode, arguments, context);
-		
+        DataRow row = node.process(rowKey, workingDirectory, executable, mode, arguments);
+
         DefaultRow expected = new DefaultRow(rowKey, new IntCell(0));
 		assertEquals(expected, row);
 	}