Merge branch 'dev_eclipseplugin'

devonfw · Dec 17, 2020 · 9090caa · 9090caa
2 parents 084e992 + a33a77a
commit 9090caa
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 25 deletions.
diff --git 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"
       provider-name="devonfw Team">
 
    <description>

diff --git 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</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
@@ -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
 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
@@ -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</version>
 
   <parent>
     <groupId>com.devonfw.cobigen</groupId>
@@ -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>
 

diff --git a/...gen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/ClassPathLoadingTest.java b/...gen-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/...ipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/OpenAPITest.java b/...ipse/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

diff --git 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</version>
 
   <parent>
     <groupId>com.devonfw.cobigen</groupId>

diff --git 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
@@ -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
 Bundle-Activator: com.devonfw.cobigen.eclipse.Activator
 Bundle-Vendor: devonfw Team
 Require-Bundle: org.eclipse.ui;bundle-version="3.104.0",
@@ -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
@@ -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
diff --git 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</version>
 
   <parent>
     <groupId>com.devonfw.cobigen</groupId>
@@ -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>

diff --git 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 v7.1.0
 * CobiGen CLI v1.2.0