From 78af6f959e5888517158b719a09d0e7d5d9d758c Mon Sep 17 00:00:00 2001 From: Stefan Verhoeven Date: Wed, 8 Nov 2017 10:49:26 +0100 Subject: [PATCH] Bump to 0.3.3 --- CHANGELOG.md | 6 ++++++ bin.linux/META-INF/MANIFEST.MF | 2 +- bin.linux/pom.xml | 2 +- bin.macosx/META-INF/MANIFEST.MF | 2 +- bin.macosx/pom.xml | 2 +- bin.windows/META-INF/MANIFEST.MF | 2 +- bin.windows/pom.xml | 2 +- bin.windows32/META-INF/MANIFEST.MF | 2 +- bin.windows32/pom.xml | 2 +- feature/feature.xml | 2 +- feature/pom.xml | 2 +- p2/category.xml | 2 +- p2/pom.xml | 2 +- plugin/META-INF/MANIFEST.MF | 2 +- plugin/pom.xml | 2 +- .../e3dchem/knime/plants/run/RunNodeModel.java | 7 +++---- pom.xml | 2 +- tests/META-INF/MANIFEST.MF | 2 +- tests/pom.xml | 2 +- .../e3dchem/knime/plants/run/RunNodeModelTest.java | 6 ++---- 20 files changed, 28 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d8f6a4..9b49b66 100644 --- 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 index 225205a..21882d1 100644 --- 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 index 2017997..2f6404f 100644 --- a/bin.linux/pom.xml +++ b/bin.linux/pom.xml @@ -4,7 +4,7 @@ 4.0.0 nl.esciencecenter.e3dchem.knime.plants - 0.3.2-SNAPSHOT + 0.3.3-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants.bin.linux diff --git a/bin.macosx/META-INF/MANIFEST.MF b/bin.macosx/META-INF/MANIFEST.MF index 4c72a57..cf823a8 100644 --- 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 index fd75528..a82e467 100644 --- a/bin.macosx/pom.xml +++ b/bin.macosx/pom.xml @@ -4,7 +4,7 @@ 4.0.0 nl.esciencecenter.e3dchem.knime.plants - 0.3.2-SNAPSHOT + 0.3.3-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants.bin.macosx diff --git a/bin.windows/META-INF/MANIFEST.MF b/bin.windows/META-INF/MANIFEST.MF index 63b04c2..6b0cd20 100644 --- 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 index 458f5a9..d08d0de 100644 --- a/bin.windows/pom.xml +++ b/bin.windows/pom.xml @@ -4,7 +4,7 @@ 4.0.0 nl.esciencecenter.e3dchem.knime.plants - 0.3.2-SNAPSHOT + 0.3.3-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants.bin.windows diff --git a/bin.windows32/META-INF/MANIFEST.MF b/bin.windows32/META-INF/MANIFEST.MF index f229017..929d425 100644 --- 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 index c2cd547..2d891c2 100644 --- a/bin.windows32/pom.xml +++ b/bin.windows32/pom.xml @@ -4,7 +4,7 @@ 4.0.0 nl.esciencecenter.e3dchem.knime.plants - 0.3.2-SNAPSHOT + 0.3.3-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants.bin.windows32 diff --git a/feature/feature.xml b/feature/feature.xml index 688da36..1c2ca58 100644 --- a/feature/feature.xml +++ b/feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/feature/pom.xml b/feature/pom.xml index 652cb81..035ad81 100644 --- a/feature/pom.xml +++ b/feature/pom.xml @@ -5,7 +5,7 @@ nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants - 0.3.2-SNAPSHOT + 0.3.3-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants.feature diff --git a/p2/category.xml b/p2/category.xml index 2c5bc31..367ca9d 100644 --- a/p2/category.xml +++ b/p2/category.xml @@ -1,6 +1,6 @@ - + diff --git a/p2/pom.xml b/p2/pom.xml index b758ba5..9692573 100644 --- a/p2/pom.xml +++ b/p2/pom.xml @@ -4,7 +4,7 @@ nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants - 0.3.2-SNAPSHOT + 0.3.3-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants.p2 eclipse-repository diff --git a/plugin/META-INF/MANIFEST.MF b/plugin/META-INF/MANIFEST.MF index 7af193f..ce4af0d 100644 --- 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 index 3a549be..46548ce 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -4,7 +4,7 @@ nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants - 0.3.2-SNAPSHOT + 0.3.3-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants.plugin eclipse-plugin 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 index 03daae0..5d724ac 100644 --- 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 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 arguments, - ExecutionContext context) - throws IOException, InterruptedException, CanceledExecutionException { + public DataRow process(RowKey rowKey, File workingDirectory, String executable, String mode, List arguments) + throws IOException, InterruptedException { List commands = new ArrayList<>(); commands.add(executable); commands.add("--mode"); diff --git a/pom.xml b/pom.xml index 1b78292..c22945d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants - 0.3.2-SNAPSHOT + 0.3.3-SNAPSHOT pom diff --git a/tests/META-INF/MANIFEST.MF b/tests/META-INF/MANIFEST.MF index b430f56..8a552eb 100644 --- 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 index 309bd48..2bf785f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants - 0.3.2-SNAPSHOT + 0.3.3-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants.tests 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 index f6559c0..d06c21d 100644 --- 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 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); }