JBIDE-27374: share dataformat.yaml from client to core (#1953)

* JBIDE-27374: share dataformat.yaml from client to core Signed-off-by: Stephane Bouchet <sbouchet@redhat.com> * upversion to 3.13.0 Signed-off-by: Stephane Bouchet <sbouchet@redhat.com>
jbosstools · Oct 9, 2020 · 0632b7f · 0632b7f
1 parent 684b39d
commit 0632b7f
Show file tree

Hide file tree

Showing 63 changed files with 83 additions and 128 deletions.
diff --git a/features/org.jboss.tools.openshift.cdk.feature/feature.xml b/features/org.jboss.tools.openshift.cdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.openshift.cdk.feature"
       label="%featureName"
-      version="3.12.0.qualifier"
+      version="3.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.openshift.cdk.server"
       license-feature="org.jboss.tools.foundation.license.feature"

diff --git a/features/org.jboss.tools.openshift.cdk.feature/pom.xml b/features/org.jboss.tools.openshift.cdk.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>features</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.features</groupId>
 	<artifactId>org.jboss.tools.openshift.cdk.feature</artifactId> 

diff --git a/features/org.jboss.tools.openshift.cdk.test.feature/feature.xml b/features/org.jboss.tools.openshift.cdk.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.openshift.cdk.test.feature"
       label="%featureName"
-      version="3.12.0.qualifier"
+      version="3.13.0.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
 	  license-feature-version="0.0.0">

diff --git a/features/org.jboss.tools.openshift.cdk.test.feature/pom.xml b/features/org.jboss.tools.openshift.cdk.test.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>features</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.features</groupId>
 	<artifactId>org.jboss.tools.openshift.cdk.test.feature</artifactId> 

diff --git a/features/org.jboss.tools.openshift.egit.integration.feature/feature.xml b/features/org.jboss.tools.openshift.egit.integration.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.openshift.egit.integration.feature"
       label="%featureName"
-      version="3.12.0.qualifier"
+      version="3.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.openshift.egit.ui"
       license-feature="org.jboss.tools.foundation.license.feature"

diff --git a/features/org.jboss.tools.openshift.egit.integration.feature/pom.xml b/features/org.jboss.tools.openshift.egit.integration.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>features</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.features</groupId>
 	<artifactId>org.jboss.tools.openshift.egit.integration.feature</artifactId> 

diff --git a/features/org.jboss.tools.openshift.egit.integration.test.feature/feature.xml b/features/org.jboss.tools.openshift.egit.integration.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.openshift.egit.integration.test.feature"
       label="%featureName"
-      version="3.12.0.qualifier"
+      version="3.13.0.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
 	  license-feature-version="0.0.0">

diff --git a/features/org.jboss.tools.openshift.egit.integration.test.feature/pom.xml b/features/org.jboss.tools.openshift.egit.integration.test.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>features</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.features</groupId>
 	<artifactId>org.jboss.tools.openshift.egit.integration.test.feature</artifactId>

diff --git a/features/org.jboss.tools.openshift.feature/feature.xml b/features/org.jboss.tools.openshift.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.openshift.feature"
       label="%featureName"
-      version="3.12.0.qualifier"
+      version="3.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.openshift.ui"
       license-feature="org.jboss.tools.foundation.license.feature"

diff --git a/features/org.jboss.tools.openshift.feature/pom.xml b/features/org.jboss.tools.openshift.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>features</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.features</groupId>
 	<artifactId>org.jboss.tools.openshift.feature</artifactId> 

diff --git a/features/org.jboss.tools.openshift.integration.tests.feature/feature.xml b/features/org.jboss.tools.openshift.integration.tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.openshift.integration.tests.feature"
       label="%featureName"
-      version="3.12.0.qualifier"
+      version="3.13.0.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
 	  license-feature-version="0.0.0">

diff --git a/features/org.jboss.tools.openshift.integration.tests.feature/pom.xml b/features/org.jboss.tools.openshift.integration.tests.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>features</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.features</groupId>
 	<artifactId>org.jboss.tools.openshift.integration.tests.feature</artifactId>

diff --git a/features/org.jboss.tools.openshift.js.feature/feature.xml b/features/org.jboss.tools.openshift.js.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.openshift.js.feature"
       label="%featureName"
-      version="3.12.0.qualifier"
+      version="3.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.openshift.js"
       license-feature="org.jboss.tools.foundation.license.feature"

diff --git a/features/org.jboss.tools.openshift.js.feature/pom.xml b/features/org.jboss.tools.openshift.js.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>features</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.features</groupId>
 	<artifactId>org.jboss.tools.openshift.js.feature</artifactId>

diff --git a/features/org.jboss.tools.openshift.test.feature/feature.xml b/features/org.jboss.tools.openshift.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.openshift.test.feature"
       label="%featureName"
-      version="3.12.0.qualifier"
+      version="3.13.0.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
       license-feature-version="0.0.0">

diff --git a/features/org.jboss.tools.openshift.test.feature/pom.xml b/features/org.jboss.tools.openshift.test.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>features</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.features</groupId>
 	<artifactId>org.jboss.tools.openshift.test.feature</artifactId> 

diff --git a/features/pom.xml b/features/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>openshift</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift</groupId>
 	<artifactId>features</artifactId>

diff --git a/itests/org.jboss.tools.cdk.ui.bot.test/META-INF/MANIFEST.MF b/itests/org.jboss.tools.cdk.ui.bot.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDK UI bot tests
 Bundle-SymbolicName: org.jboss.tools.cdk.ui.bot.test
-Bundle-Version: 3.12.0.qualifier
+Bundle-Version: 3.13.0.qualifier
 Bundle-Vendor: Red Hat
 Require-Bundle: org.junit,
  org.eclipse.reddeer.go;bundle-version="3.0.0",

diff --git a/itests/org.jboss.tools.cdk.ui.bot.test/build.properties b/itests/org.jboss.tools.cdk.ui.bot.test/build.properties
@@ -2,4 +2,6 @@ source.. = src/
 src.includes = *
 src.excludes = src/
 bin.includes = META-INF/,\
-               .
+               .,\
+               plugin.properties
+output.. = bin/
diff --git a/itests/org.jboss.tools.cdk.ui.bot.test/pom.xml b/itests/org.jboss.tools.cdk.ui.bot.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>itests</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.jboss.tools.cdk.tests</groupId>

diff --git a/itests/org.jboss.tools.openshift.ui.bot.test/META-INF/MANIFEST.MF b/itests/org.jboss.tools.openshift.ui.bot.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: OpenShift UI Bot Tests
 Bundle-SymbolicName: org.jboss.tools.openshift.ui.bot.test;singleton:=true
-Bundle-Version: 3.12.0.qualifier
+Bundle-Version: 3.13.0.qualifier
 Bundle-Activator: org.jboss.tools.openshift.ui.bot.test.Activator
 Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.ui.editors,

diff --git a/itests/org.jboss.tools.openshift.ui.bot.test/pom.xml b/itests/org.jboss.tools.openshift.ui.bot.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>itests</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.tests</groupId>
 	<artifactId>org.jboss.tools.openshift.ui.bot.test</artifactId>

diff --git a/itests/pom.xml b/itests/pom.xml
@@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>openshift</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift</groupId>
 	<artifactId>itests</artifactId>

diff --git a/jacoco-report/pom.xml b/jacoco-report/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>openshift</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift</groupId>
 	<artifactId>jacoco-report</artifactId>
@@ -37,78 +37,78 @@
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.egit.core</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.13.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.egit.ui</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.13.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.client</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.13.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.common.core</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.13.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.common.ui</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.13.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.core</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.13.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.ui</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.13.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.cdk.server</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.13.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.js</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.13.0-SNAPSHOT</version>
         </dependency>
         <!-- tests -->
         <dependency>
             <groupId>org.jboss.tools.openshift.tests</groupId>
             <artifactId>org.jboss.tools.openshift.egit.test</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.13.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.tests</groupId>
             <artifactId>org.jboss.tools.openshift.test</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.13.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.tests</groupId>
             <artifactId>org.jboss.tools.openshift.cdk.server.test</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.13.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <!-- integration tests -->
         <dependency>
             <groupId>org.jboss.tools.openshift.tests</groupId>
             <artifactId>org.jboss.tools.openshift.ui.bot.test</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.13.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.cdk.tests</groupId>
             <artifactId>org.jboss.tools.cdk.ui.bot.test</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.13.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/plugins/org.jboss.tools.openshift.cdk.server/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.openshift.cdk.server/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jboss.tools.openshift.cdk.server;singleton:=true
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 3.12.0.qualifier
+Bundle-Version: 3.13.0.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.jboss.tools.openshift.internal.cdk.server.core.CDKCoreActivator
 Require-Bundle: org.jboss.tools.usage;bundle-version="2.1.0",

diff --git a/plugins/org.jboss.tools.openshift.cdk.server/pom.xml b/plugins/org.jboss.tools.openshift.cdk.server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.plugins</groupId>
 	<artifactId>org.jboss.tools.openshift.cdk.server</artifactId> 

diff --git a/plugins/org.jboss.tools.openshift.client/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.openshift.client/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jboss.tools.openshift.client;singleton:=true
-Bundle-Version: 3.12.0.qualifier
+Bundle-Version: 3.13.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
@@ -29,7 +29,8 @@ Bundle-ClassPath: .,
  lib/openshift-client-4.9.1.jar,
  lib/servicecatalog-client-4.9.1.jar,
  lib/servicecatalog-model-4.9.1.jar
-Export-Package: com.openshift.internal.restclient;x-friends:="org.jboss.tools.openshift.test",
+Export-Package: com.fasterxml.jackson.dataformat.yaml,
+ com.openshift.internal.restclient;x-friends:="org.jboss.tools.openshift.test",
  com.openshift.restclient,
  com.openshift.restclient.api,
  com.openshift.restclient.api.capabilities,

diff --git a/plugins/org.jboss.tools.openshift.client/pom.xml b/plugins/org.jboss.tools.openshift.client/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.plugins</groupId>
 	<artifactId>org.jboss.tools.openshift.client</artifactId> 

diff --git a/plugins/org.jboss.tools.openshift.common.core/.classpath b/plugins/org.jboss.tools.openshift.common.core/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<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/"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.jboss.tools.openshift.common.core/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.openshift.common.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jboss.tools.openshift.common.core
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 3.12.0.qualifier
+Bundle-Version: 3.13.0.qualifier
 Bundle-Activator: org.jboss.tools.openshift.internal.common.core.OpenShiftCommonCoreActivator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/plugins/org.jboss.tools.openshift.common.core/build.properties b/plugins/org.jboss.tools.openshift.common.core/build.properties
@@ -1,10 +1,8 @@
 source.. = src/
 src.includes = *,\
-               pom.xml,\
-               src/
+               pom.xml
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
                META-INF/connectionsFactory.xml,\
                plugin.properties
diff --git a/plugins/org.jboss.tools.openshift.common.core/pom.xml b/plugins/org.jboss.tools.openshift.common.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.12.0-SNAPSHOT</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.plugins</groupId>
 	<artifactId>org.jboss.tools.openshift.common.core</artifactId>