Merge branch 'main' into JBIDE-28870

jbosstools · Oct 10, 2023 · 997024c · 997024c
2 parents 6f23b24 + 3ad0690
commit 997024c
Show file tree

Hide file tree

Showing 144 changed files with 27,903 additions and 9,905 deletions.
diff --git a/.github/workflows/publish_reports.yml b/.github/workflows/publish_reports.yml
@@ -42,7 +42,7 @@ jobs:
         run: |
           find . -name '*.zip' -exec sh -c 'unzip -d "${1%.*}" "$1"' _ {} \;
       - name: Publish aggregated tests reports
-        uses: scacap/action-surefire-report@v1
+        uses: scacap/action-surefire-report@4cbb611f23a9b5a030c73c2b32190a80983956ed #v1
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           report_paths: '${{github.workspace}}/*test-reports/**/TEST-*.xml'

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.22.0.qualifier"
+      version="3.24.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.22.0-SNAPSHOT</version>
+		<version>3.24.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,10 +2,10 @@
 <feature
       id="org.jboss.tools.openshift.cdk.test.feature"
       label="%featureName"
-      version="3.22.0.qualifier"
+      version="3.24.0.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
-	  license-feature-version="0.0.0">
+      license-feature-version="0.0.0">
 
    <description url="%descriptionURL">
       %description
@@ -19,25 +19,11 @@
       %license
    </license>
 
-   <plugin
-         id="org.jboss.tools.cdk.reddeer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.jboss.tools.openshift.cdk.server.test"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
-    <plugin
-         id="org.jboss.tools.cdk.ui.bot.test"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
 </feature>
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.22.0-SNAPSHOT</version>
+		<version>3.24.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.22.0.qualifier"
+      version="3.24.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.22.0-SNAPSHOT</version>
+		<version>3.24.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.22.0.qualifier"
+      version="3.24.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.22.0-SNAPSHOT</version>
+		<version>3.24.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.22.0.qualifier"
+      version="3.24.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.22.0-SNAPSHOT</version>
+		<version>3.24.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.22.0.qualifier"
+      version="3.24.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.22.0-SNAPSHOT</version>
+		<version>3.24.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.22.0.qualifier"
+      version="3.24.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.22.0-SNAPSHOT</version>
+		<version>3.24.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.22.0.qualifier"
+      version="3.24.0.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
       license-feature-version="0.0.0">
@@ -32,12 +32,5 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
-    <plugin
-         id="org.jboss.tools.openshift.ui.bot.test"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
 </feature>
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.22.0-SNAPSHOT</version>
+		<version>3.24.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.22.0-SNAPSHOT</version>
+		<version>3.24.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift</groupId>
 	<artifactId>features</artifactId>
@@ -18,7 +18,6 @@
 		<module>org.jboss.tools.openshift.egit.integration.test.feature</module>
 		<module>org.jboss.tools.openshift.cdk.feature</module>
 		<module>org.jboss.tools.openshift.cdk.test.feature</module>
-        <module>org.jboss.tools.openshift.integration.tests.feature</module>
 		<module>org.jboss.tools.openshift.js.feature</module>
 	</modules>
 	<build>

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.22.0.qualifier
+Bundle-Version: 3.24.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/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.22.0-SNAPSHOT</version>
+		<version>3.24.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.22.0.qualifier
+Bundle-Version: 3.24.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.22.0-SNAPSHOT</version>
+		<version>3.24.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.tests</groupId>
 	<artifactId>org.jboss.tools.openshift.ui.bot.test</artifactId>
@@ -16,7 +16,7 @@
 		<systemProperties>
 			-Dtest.configurations.dir=${configurations.dir} -Dopenshift.server=${openshift.server} -Dopenshift.username=${openshift.username} -Dopenshift.password=${openshift.password} -Dopenshift.token=${openshift.token} -Dopenshift.authmethod=${openshift.authmethod} -Dsecurestorage.password=${securestorage.password} -Dusage_reporting_enabled=false -Duse.cdk=${use.cdk} -Doc.linux.latest=${oc.linux.latest} -Doc.windows.latest=${oc.windows.latest} -Doc.mac.latest=${oc.mac.latest} -Doc.linux.1.1.64=${oc.linux.1.1.64} -Doc.windows.1.1.64=${oc.windows.1.1.64} -Doc.mac.1.1.64=${oc.mac.1.1.64}
 		</systemProperties>
-		<test.class>org.jboss.tools.openshift.ui.bot.test.OpenShift3StableBotTests</test.class>
+		<test.class>org.jboss.tools.openshift.ui.bot.test.OpenShift4SmokeTests</test.class>
 		<surefire.timeout>9600</surefire.timeout>
 		<openshift.server></openshift.server>
 		<openshift.username></openshift.username>
@@ -74,34 +74,10 @@
 		</plugins>
 	</build>
 	<profiles>
-		<profile>
-			<id>smoke</id>
-			<properties>
-				<test.class>org.jboss.tools.openshift.ui.bot.test.OpenShift3SmokeBotTests</test.class>
-			</properties>
-		</profile>
-		<profile>
-			<id>full</id>
-			<properties>
-				<test.class>org.jboss.tools.openshift.ui.bot.test.OpenShift3BotTests</test.class>
-			</properties>
-		</profile>
-		<profile>
-			<id>eap-cd</id>
-			<properties>
-				<test.class>org.jboss.tools.openshift.ui.bot.test.OpenShift3EAPCDTests</test.class>
-			</properties>
-		</profile>
 		<profile>
 			<id>openshift4</id>
 			<properties>
-				<test.class>org.jboss.tools.openshift.ui.bot.test.OpenShift4StableBotTests</test.class>
-			</properties>
-		</profile>
-		<profile>
-			<id>openshift-interop</id>
-			<properties>
-				<test.class>org.jboss.tools.openshift.ui.bot.test.OpenShiftInteropTests</test.class>
+				<test.class>org.jboss.tools.openshift.ui.bot.test.OpenShift4SmokeTests</test.class>
 			</properties>
 		</profile>
 		<profile>