Fix after 4.29.0.Final release

Signed-off-by: Stephane Bouchet <[email protected]>
jbosstools · Nov 3, 2023 · ad16889 · ad16889
1 parent a768372
commit ad16889
Show file tree

Hide file tree

Showing 57 changed files with 209 additions and 85 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.24.0.qualifier"
+      version="3.24.100.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.24.0-SNAPSHOT</version>
+		<version>3.24.100-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.24.0.qualifier"
+      version="3.24.100.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.24.0-SNAPSHOT</version>
+		<version>3.24.100-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.24.0.qualifier"
+      version="3.24.100.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.24.0-SNAPSHOT</version>
+		<version>3.24.100-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.24.0.qualifier"
+      version="3.24.100.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.24.0-SNAPSHOT</version>
+		<version>3.24.100-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.24.0.qualifier"
+      version="3.24.100.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.24.0-SNAPSHOT</version>
+		<version>3.24.100-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.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.24.0.qualifier"
+      version="3.24.100.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.24.0-SNAPSHOT</version>
+		<version>3.24.100-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.24.0.qualifier"
+      version="3.24.100.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.24.0-SNAPSHOT</version>
+		<version>3.24.100-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.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift</groupId>
 	<artifactId>features</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.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift</groupId>
 	<artifactId>jacoco-report</artifactId>
@@ -37,65 +37,65 @@
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.egit.core</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.egit.ui</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.client</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.common.core</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.common.ui</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.core</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.ui</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.cdk.server</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.js</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <!-- tests -->
         <dependency>
             <groupId>org.jboss.tools.openshift.tests</groupId>
             <artifactId>org.jboss.tools.openshift.egit.test</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.tests</groupId>
             <artifactId>org.jboss.tools.openshift.test</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-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.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/plugins/org.jboss.tools.openshift.cdk.server/.classpath b/plugins/org.jboss.tools.openshift.cdk.server/.classpath
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
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.24.0.qualifier
+Bundle-Version: 3.24.100.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.24.0-SNAPSHOT</version>
+		<version>3.24.100-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/.classpath b/plugins/org.jboss.tools.openshift.client/.classpath
@@ -6,7 +6,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/openshift-restclient-java-9.0.5.Final.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/okhttp-4.10.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/logging-interceptor-4.10.0.jar"/>

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.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin

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.24.0-SNAPSHOT</version>
+		<version>3.24.100-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
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="bin" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<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.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-Activator: org.jboss.tools.openshift.internal.common.core.OpenShiftCommonCoreActivator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11

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.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.plugins</groupId>
 	<artifactId>org.jboss.tools.openshift.common.core</artifactId> 

diff --git a/plugins/org.jboss.tools.openshift.common.ui/.classpath b/plugins/org.jboss.tools.openshift.common.ui/.classpath
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" output="bin" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.jboss.tools.openshift.common.ui/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.openshift.common.ui/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.common.ui;singleton:=true
-Bundle-Version: 3.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.jboss.tools.openshift.internal.common.ui.OpenShiftCommonUIActivator
 Require-Bundle: org.jboss.tools.openshift.common.core;bundle-version="[3.0.0,4.0.0)",

diff --git a/plugins/org.jboss.tools.openshift.common.ui/pom.xml b/plugins/org.jboss.tools.openshift.common.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.plugins</groupId>
 	<artifactId>org.jboss.tools.openshift.common.ui</artifactId>