Prep for v1.1.1 release

3D-e-Chem · Sep 26, 2017 · 0e26557 · 0e26557
1 parent ed0f22e
commit 0e26557
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ The file is formatted as described on http://keepachangelog.com/.
 
 ## [Unreleased]
 
+## [1.1.1] - 2017-09-26
+
 ### Fixed
 
 * Metanodes not found

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 Silicos-it software, Linux binaries
 Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.silicosit.bin.linux;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.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.silicosit</groupId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <artifactId>nl.esciencecenter.e3dchem.knime.silicosit</artifactId>
   </parent>
   <artifactId>nl.esciencecenter.e3dchem.knime.silicosit.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 Silicos-it software, Mac OSX binaries
 Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.silicosit.bin.macosx;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.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.silicosit</groupId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <artifactId>nl.esciencecenter.e3dchem.knime.silicosit</artifactId>
   </parent>
   <artifactId>nl.esciencecenter.e3dchem.knime.silicosit.bin.macosx</artifactId>

diff --git a/feature/feature.xml b/feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="nl.esciencecenter.e3dchem.knime.silicosit.feature"
       label="Silicos-it KNIME nodes"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="Netherlands eScience Center"
       os="linux,macosx"
       arch="x86_64">

diff --git a/feature/pom.xml b/feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>nl.esciencecenter.e3dchem.knime.silicosit</groupId>
 		<artifactId>nl.esciencecenter.e3dchem.knime.silicosit</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>nl.esciencecenter.e3dchem.knime.silicosit.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.silicosit.feature-1.1.0.qualifier.jar" id="nl.esciencecenter.e3dchem.knime.silicosit.feature" version="1.1.0.qualifier">
+   <feature url="features/nl.esciencecenter.e3dchem.knime.silicosit.feature-1.1.1.qualifier.jar" id="nl.esciencecenter.e3dchem.knime.silicosit.feature" version="1.1.1.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.silicosit</artifactId>
         <groupId>nl.esciencecenter.e3dchem.knime.silicosit</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <artifactId>nl.esciencecenter.e3dchem.knime.silicosit.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 Silicos-it software
 Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.silicosit.plugin;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Netherlands eScience Center
 Require-Bundle: org.eclipse.core.runtime,

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

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>nl.esciencecenter.e3dchem.knime.silicosit</groupId>
 	<artifactId>nl.esciencecenter.e3dchem.knime.silicosit</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.1-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.silicosit.tests
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.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.silicosit</groupId>
 		<artifactId>nl.esciencecenter.e3dchem.knime.silicosit</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>nl.esciencecenter.e3dchem.knime.silicosit.tests</artifactId>

diff --git a/tests/src/java/nl/esciencecenter/e3dchem/knime/silicosit/preferences/PreferencePageTest.java b/tests/src/java/nl/esciencecenter/e3dchem/knime/silicosit/preferences/PreferencePageTest.java
@@ -14,7 +14,7 @@
 
 @RunWith(SWTBotJunit4ClassRunner.class)
 public class PreferencePageTest {
-    private static SWTWorkbenchBot bot;
+    private static SWTWorkbenchBot bot = null;
 
     @BeforeClass
     public static void setUp() {
@@ -24,7 +24,9 @@ public static void setUp() {
 
     @AfterClass
     public static void sleep() {
-        bot.closeAllShells();
+        if (bot != null) {
+            bot.closeAllShells();
+        }
     }
 
     @Test