Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix after 4.29.0.Final release #2118

Merged
merged 2 commits into from
Nov 3, 2023
Merged

Fix after 4.29.0.Final release #2118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad16889
Fix after 4.29.0.Final release
sbouchet Nov 3, 2023
c51c9d7
Merge branch 'jbosstools:main' into Fix_after_4.29.0.Final_release
sbouchet Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.cdk.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.cdk.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.cdk.test.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.cdk.test.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.egit.integration.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.egit.integration.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.egit.integration.test.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.egit.integration.test.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.js.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.js.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.test.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.test.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion features/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
26 changes: 13 additions & 13 deletions jacoco-report/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
18 changes: 16 additions & 2 deletions plugins/org.jboss.tools.openshift.cdk.server/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.cdk.server/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.cdk.server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.client/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.client/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
18 changes: 16 additions & 2 deletions plugins/org.jboss.tools.openshift.common.core/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.common.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.common.core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
20 changes: 17 additions & 3 deletions plugins/org.jboss.tools.openshift.common.ui/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.common.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.common.ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading
Loading