From a73cbe815ffa25966995585d3d986d9185b4e1f9 Mon Sep 17 00:00:00 2001
From: Malte Brunnlieb <malte.brunnlieb@capgemini.com>
Date: Mon, 14 Sep 2020 08:30:22 +0200
Subject: [PATCH 1/7] #1216 Set next development version

---
 cobigen-eclipse/cobigen-eclipse-feature/feature.xml       | 2 +-
 cobigen-eclipse/cobigen-eclipse-feature/pom.xml           | 2 +-
 cobigen-eclipse/cobigen-eclipse-test/META-INF/MANIFEST.MF | 2 +-
 cobigen-eclipse/cobigen-eclipse-test/pom.xml              | 2 +-
 cobigen-eclipse/cobigen-eclipse-updatesite/pom.xml        | 2 +-
 cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF      | 2 +-
 cobigen-eclipse/cobigen-eclipse/pom.xml                   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cobigen-eclipse/cobigen-eclipse-feature/feature.xml b/cobigen-eclipse/cobigen-eclipse-feature/feature.xml
index b6936cbb43..67d8f4f4fb 100644
--- a/cobigen-eclipse/cobigen-eclipse-feature/feature.xml
+++ b/cobigen-eclipse/cobigen-eclipse-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.devonfw.cobigen.eclipse.feature"
       label="CobiGen Eclipse Plug-in"
-      version="7.0.0"
+      version="7.1.0.qualifier"
       provider-name="devonfw Team">
 
    <description>
diff --git a/cobigen-eclipse/cobigen-eclipse-feature/pom.xml b/cobigen-eclipse/cobigen-eclipse-feature/pom.xml
index 809939c736..0f03bdddb6 100644
--- a/cobigen-eclipse/cobigen-eclipse-feature/pom.xml
+++ b/cobigen-eclipse/cobigen-eclipse-feature/pom.xml
@@ -5,7 +5,7 @@
   <artifactId>com.devonfw.cobigen.eclipse.feature</artifactId>
   <name>CobiGen - Eclipse Plug-In Feature</name>
   <packaging>eclipse-feature</packaging>
-  <version>7.0.0</version>
+  <version>7.1.0-SNAPSHOT</version>
 
   <parent>
     <groupId>com.devonfw.cobigen</groupId>
diff --git a/cobigen-eclipse/cobigen-eclipse-test/META-INF/MANIFEST.MF b/cobigen-eclipse/cobigen-eclipse-test/META-INF/MANIFEST.MF
index a7d5b568f4..fe77bb491e 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/META-INF/MANIFEST.MF
+++ b/cobigen-eclipse/cobigen-eclipse-test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CobiGen Eclipse Plug-In Tests
 Bundle-SymbolicName: com.devonfw.cobigen.eclipse.test;singleton:=true
-Bundle-Version: 7.0.0
+Bundle-Version: 7.1.0.qualifier
 Bundle-Vendor: Capgemini
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/cobigen-eclipse/cobigen-eclipse-test/pom.xml b/cobigen-eclipse/cobigen-eclipse-test/pom.xml
index 75f21b0852..3d717560f1 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/pom.xml
+++ b/cobigen-eclipse/cobigen-eclipse-test/pom.xml
@@ -3,7 +3,7 @@
   <artifactId>com.devonfw.cobigen.eclipse.test</artifactId>
   <name>CobiGen - Eclipse Plug-In Tests</name>
   <packaging>eclipse-test-plugin</packaging>
-  <version>7.0.0</version>
+  <version>7.1.0-SNAPSHOT</version>
 
   <parent>
     <groupId>com.devonfw.cobigen</groupId>
diff --git a/cobigen-eclipse/cobigen-eclipse-updatesite/pom.xml b/cobigen-eclipse/cobigen-eclipse-updatesite/pom.xml
index 4b3083dfbc..7e75a874f1 100644
--- a/cobigen-eclipse/cobigen-eclipse-updatesite/pom.xml
+++ b/cobigen-eclipse/cobigen-eclipse-updatesite/pom.xml
@@ -5,7 +5,7 @@
   <artifactId>eclipse</artifactId>
   <name>CobiGen - Eclipse Plug-In UpdateSite</name>
   <packaging>eclipse-repository</packaging>
-  <version>7.0.0</version>
+  <version>7.1.0-SNAPSHOT</version>
 
   <parent>
     <groupId>com.devonfw.cobigen</groupId>
diff --git a/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF b/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF
index 4d0b30c3a7..5ed99568bd 100644
--- a/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF
+++ b/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CobiGen Eclipse Plug-in
 Bundle-SymbolicName: com.devonfw.cobigen.eclipse;singleton:=true
-Bundle-Version: 7.0.0
+Bundle-Version: 7.1.0.qualifier
 Bundle-Activator: com.devonfw.cobigen.eclipse.Activator
 Bundle-Vendor: devonfw Team
 Require-Bundle: org.eclipse.ui;bundle-version="3.104.0",
diff --git a/cobigen-eclipse/cobigen-eclipse/pom.xml b/cobigen-eclipse/cobigen-eclipse/pom.xml
index f7bf1435df..67b8c37bff 100644
--- a/cobigen-eclipse/cobigen-eclipse/pom.xml
+++ b/cobigen-eclipse/cobigen-eclipse/pom.xml
@@ -3,7 +3,7 @@
   <artifactId>com.devonfw.cobigen.eclipse</artifactId>
   <name>CobiGen - Eclipse Plug-In</name>
   <packaging>eclipse-plugin</packaging>
-  <version>7.0.0</version>
+  <version>7.1.0-SNAPSHOT</version>
 
   <parent>
     <groupId>com.devonfw.cobigen</groupId>

From 9d50f2843d75fd01832c61d9236eeee1a9e845f5 Mon Sep 17 00:00:00 2001
From: Malte Brunnlieb <malte.brunnlieb@capgemini.com>
Date: Tue, 15 Sep 2020 06:40:53 +0200
Subject: [PATCH 2/7] #1033 reenabled failing tests

---
 .../com/devonfw/cobigen/eclipse/test/ClassPathLoadingTest.java | 2 --
 .../java/com/devonfw/cobigen/eclipse/test/OpenAPITest.java     | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/ClassPathLoadingTest.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/ClassPathLoadingTest.java
index ce7bc7128b..688de5003c 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/ClassPathLoadingTest.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/ClassPathLoadingTest.java
@@ -15,7 +15,6 @@
 import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -57,7 +56,6 @@ public static void setupClass() throws Exception {
      *             Test fails
      */
     @Test
-    @Ignore // does not run on jdk8 on travis only, for any reason.
     public void testPreventClassPathShading() throws Exception {
 
         // create a new temporary java project and copy java class used as an input for CobiGen
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/OpenAPITest.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/OpenAPITest.java
index 01e614db69..0545c95f4c 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/OpenAPITest.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/OpenAPITest.java
@@ -18,7 +18,6 @@
 import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -59,7 +58,6 @@ public static void setupClass() throws Exception {
      *             test fails
      */
     @Test
-    @Ignore // does not run on jdk8 on travis only, for any reason.
     public void testBasicOpenAPIGeneration() throws Exception {
 
         // copy sample project to external location and import it into the workspace
@@ -141,7 +139,6 @@ public void testBasicOpenAPIGeneration() throws Exception {
      *             test fails
      */
     @Test
-    @Ignore // does not run on jdk8 on travis only, for any reason.
     public void testServiceBasedOpenAPIGeneration() throws Exception {
 
         // copy sample project to external location and import it into the workspace

From b1a09876bbe69d9eef0d7b5e461aa824120b0133 Mon Sep 17 00:00:00 2001
From: MikeSchumacher <mike.schumacher@capgemini.com>
Date: Fri, 11 Dec 2020 14:17:21 +0100
Subject: [PATCH 3/7] updated dependencies in eclipse test

---
 cobigen-eclipse/cobigen-eclipse-test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cobigen-eclipse/cobigen-eclipse-test/pom.xml b/cobigen-eclipse/cobigen-eclipse-test/pom.xml
index 3d717560f1..1025fdc1cb 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/pom.xml
+++ b/cobigen-eclipse/cobigen-eclipse-test/pom.xml
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>com.devonfw.cobigen</groupId>
       <artifactId>core-test</artifactId>
-      <version>7.0.0</version>
+      <version>7.1.0</version>
     </dependency>
   </dependencies>
 

From aa5c647754bffa327c1eb07a2949e9cd3bb82879 Mon Sep 17 00:00:00 2001
From: MikeSchumacher <mike.schumacher@capgemini.com>
Date: Fri, 11 Dec 2020 14:25:29 +0100
Subject: [PATCH 4/7] updated core dependency in eclipse plugin

---
 cobigen-eclipse/cobigen-eclipse/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cobigen-eclipse/cobigen-eclipse/pom.xml b/cobigen-eclipse/cobigen-eclipse/pom.xml
index 67b8c37bff..82b14cb847 100644
--- a/cobigen-eclipse/cobigen-eclipse/pom.xml
+++ b/cobigen-eclipse/cobigen-eclipse/pom.xml
@@ -15,12 +15,12 @@
     <dependency>
       <groupId>com.devonfw.cobigen</groupId>
       <artifactId>core</artifactId>
-      <version>7.0.0</version>
+      <version>7.1.0</version>
     </dependency>
     <dependency>
       <groupId>com.devonfw.cobigen</groupId>
       <artifactId>javaplugin-model</artifactId>
-      <version>7.0.0</version>
+      <version>7.1.0</version>
     </dependency>
 
     <dependency>

From 81d26b036607cd1906c3ecbfcd54e7cbe9e27c1c Mon Sep 17 00:00:00 2001
From: MikeSchumacher <mike.schumacher@capgemini.com>
Date: Mon, 14 Dec 2020 09:48:20 +0100
Subject: [PATCH 5/7] added missing build files

---
 cobigen-eclipse/cobigen-eclipse/.classpath           | 6 +++---
 cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF | 6 +++---
 cobigen-eclipse/cobigen-eclipse/build.properties     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cobigen-eclipse/cobigen-eclipse/.classpath b/cobigen-eclipse/cobigen-eclipse/.classpath
index 7b9795fd91..5efbe5df64 100644
--- a/cobigen-eclipse/cobigen-eclipse/.classpath
+++ b/cobigen-eclipse/cobigen-eclipse/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/core-7.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/core-api-7.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/javaplugin-model-7.0.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/core-7.1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/core-api-7.1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/javaplugin-model-7.1.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
diff --git a/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF b/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF
index 5ed99568bd..8f58812e7e 100644
--- a/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF
+++ b/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF
@@ -44,7 +44,7 @@ Bundle-ClassPath: .,
  lib/logback-core-1.1.2.jar,
  lib/mmm-util-core-7.4.0.jar,
  lib/slf4j-api-1.7.21.jar,
- lib/core-7.0.0.jar,
- lib/core-api-7.0.0.jar,
- lib/javaplugin-model-7.0.0.jar
+ lib/core-7.1.0.jar,
+ lib/core-api-7.1.0.jar,
+ lib/javaplugin-model-7.1.0.jar
 Export-Package: com.devonfw.cobigen.eclipse.common.constants.external
diff --git a/cobigen-eclipse/cobigen-eclipse/build.properties b/cobigen-eclipse/cobigen-eclipse/build.properties
index 8491b0035f..47ad4bbb77 100644
--- a/cobigen-eclipse/cobigen-eclipse/build.properties
+++ b/cobigen-eclipse/cobigen-eclipse/build.properties
@@ -27,6 +27,6 @@ bin.includes = .,\
                lib/logback-core-1.1.2.jar,\
                lib/mmm-util-core-7.4.0.jar,\
                lib/slf4j-api-1.7.21.jar,\
-               lib/core-7.0.0.jar,\
-               lib/core-api-7.0.0.jar,\
-               lib/javaplugin-model-7.0.0.jar
+               lib/core-7.1.0.jar,\
+               lib/core-api-7.1.0.jar,\
+               lib/javaplugin-model-7.1.0.jar

From 98147169fa377653e5cde3be58fd4ec027918f5f Mon Sep 17 00:00:00 2001
From: MikeSchumacher <mike.schumacher@capgemini.com>
Date: Thu, 17 Dec 2020 14:00:10 +0100
Subject: [PATCH 6/7] #1301 update wiki docs

---
 documentation/master-cobigen.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/master-cobigen.asciidoc b/documentation/master-cobigen.asciidoc
index 35c69576e5..92a6143cb4 100644
--- a/documentation/master-cobigen.asciidoc
+++ b/documentation/master-cobigen.asciidoc
@@ -11,7 +11,7 @@ DISCLAIMER: All Cobigen plugins are compatible with the latest release of Devonf
 
 **Current versions:**
 
-* CobiGen - Eclipse Plug-in v7.0.0
+* CobiGen - Eclipse Plug-in v7.1.0
 * CobiGen - Maven Build Plug-in v5.2.0
 * CobiGen CLI v1.2.0
 

From a33a77a5c0f1e4b44422ae3989b2969b02d7f83b Mon Sep 17 00:00:00 2001
From: MikeSchumacher <mike.schumacher@capgemini.com>
Date: Thu, 17 Dec 2020 14:00:35 +0100
Subject: [PATCH 7/7] #1301 Set release version

---
 cobigen-eclipse/cobigen-eclipse-feature/feature.xml       | 2 +-
 cobigen-eclipse/cobigen-eclipse-feature/pom.xml           | 2 +-
 cobigen-eclipse/cobigen-eclipse-test/META-INF/MANIFEST.MF | 2 +-
 cobigen-eclipse/cobigen-eclipse-test/pom.xml              | 2 +-
 cobigen-eclipse/cobigen-eclipse-updatesite/pom.xml        | 2 +-
 cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF      | 2 +-
 cobigen-eclipse/cobigen-eclipse/pom.xml                   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cobigen-eclipse/cobigen-eclipse-feature/feature.xml b/cobigen-eclipse/cobigen-eclipse-feature/feature.xml
index 67d8f4f4fb..e9d3e557f7 100644
--- a/cobigen-eclipse/cobigen-eclipse-feature/feature.xml
+++ b/cobigen-eclipse/cobigen-eclipse-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.devonfw.cobigen.eclipse.feature"
       label="CobiGen Eclipse Plug-in"
-      version="7.1.0.qualifier"
+      version="7.1.0"
       provider-name="devonfw Team">
 
    <description>
diff --git a/cobigen-eclipse/cobigen-eclipse-feature/pom.xml b/cobigen-eclipse/cobigen-eclipse-feature/pom.xml
index 0f03bdddb6..ebf8e1e647 100644
--- a/cobigen-eclipse/cobigen-eclipse-feature/pom.xml
+++ b/cobigen-eclipse/cobigen-eclipse-feature/pom.xml
@@ -5,7 +5,7 @@
   <artifactId>com.devonfw.cobigen.eclipse.feature</artifactId>
   <name>CobiGen - Eclipse Plug-In Feature</name>
   <packaging>eclipse-feature</packaging>
-  <version>7.1.0-SNAPSHOT</version>
+  <version>7.1.0</version>
 
   <parent>
     <groupId>com.devonfw.cobigen</groupId>
diff --git a/cobigen-eclipse/cobigen-eclipse-test/META-INF/MANIFEST.MF b/cobigen-eclipse/cobigen-eclipse-test/META-INF/MANIFEST.MF
index fe77bb491e..67a7ac6dc8 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/META-INF/MANIFEST.MF
+++ b/cobigen-eclipse/cobigen-eclipse-test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CobiGen Eclipse Plug-In Tests
 Bundle-SymbolicName: com.devonfw.cobigen.eclipse.test;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 7.1.0
 Bundle-Vendor: Capgemini
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/cobigen-eclipse/cobigen-eclipse-test/pom.xml b/cobigen-eclipse/cobigen-eclipse-test/pom.xml
index 1025fdc1cb..39253b9f18 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/pom.xml
+++ b/cobigen-eclipse/cobigen-eclipse-test/pom.xml
@@ -3,7 +3,7 @@
   <artifactId>com.devonfw.cobigen.eclipse.test</artifactId>
   <name>CobiGen - Eclipse Plug-In Tests</name>
   <packaging>eclipse-test-plugin</packaging>
-  <version>7.1.0-SNAPSHOT</version>
+  <version>7.1.0</version>
 
   <parent>
     <groupId>com.devonfw.cobigen</groupId>
diff --git a/cobigen-eclipse/cobigen-eclipse-updatesite/pom.xml b/cobigen-eclipse/cobigen-eclipse-updatesite/pom.xml
index 7e75a874f1..c53ca46715 100644
--- a/cobigen-eclipse/cobigen-eclipse-updatesite/pom.xml
+++ b/cobigen-eclipse/cobigen-eclipse-updatesite/pom.xml
@@ -5,7 +5,7 @@
   <artifactId>eclipse</artifactId>
   <name>CobiGen - Eclipse Plug-In UpdateSite</name>
   <packaging>eclipse-repository</packaging>
-  <version>7.1.0-SNAPSHOT</version>
+  <version>7.1.0</version>
 
   <parent>
     <groupId>com.devonfw.cobigen</groupId>
diff --git a/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF b/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF
index 8f58812e7e..f1313fa380 100644
--- a/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF
+++ b/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CobiGen Eclipse Plug-in
 Bundle-SymbolicName: com.devonfw.cobigen.eclipse;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 7.1.0
 Bundle-Activator: com.devonfw.cobigen.eclipse.Activator
 Bundle-Vendor: devonfw Team
 Require-Bundle: org.eclipse.ui;bundle-version="3.104.0",
diff --git a/cobigen-eclipse/cobigen-eclipse/pom.xml b/cobigen-eclipse/cobigen-eclipse/pom.xml
index 82b14cb847..3e24b1ea3c 100644
--- a/cobigen-eclipse/cobigen-eclipse/pom.xml
+++ b/cobigen-eclipse/cobigen-eclipse/pom.xml
@@ -3,7 +3,7 @@
   <artifactId>com.devonfw.cobigen.eclipse</artifactId>
   <name>CobiGen - Eclipse Plug-In</name>
   <packaging>eclipse-plugin</packaging>
-  <version>7.1.0-SNAPSHOT</version>
+  <version>7.1.0</version>
 
   <parent>
     <groupId>com.devonfw.cobigen</groupId>