Skip to content

Commit

Permalink
Fix after 4.29.0.Final release (#765)
Browse files Browse the repository at this point in the history
* Fix after 4.29.0.Final release

Signed-off-by: Stephane Bouchet <[email protected]>

* Fix after 4.29.0.Final release

fix test

Signed-off-by: Stephane Bouchet <[email protected]>

---------

Signed-off-by: Stephane Bouchet <[email protected]>
  • Loading branch information
sbouchet committed Nov 3, 2023
1 parent 1a7b0a3 commit df43ce1
Show file tree
Hide file tree
Showing 36 changed files with 83 additions and 41 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.foundation.feature"
label="%featureName"
version="1.6.1800.qualifier"
version="1.6.1900.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.foundation.ui"
license-feature="org.jboss.tools.foundation.license.feature"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.foundation</groupId>
<artifactId>features</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.foundation.features</groupId>
<artifactId>org.jboss.tools.foundation.feature</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.foundation.license.feature"
label="JBoss Tools License feature"
version="1.6.1800.qualifier"
version="1.6.1900.qualifier"
provider-name="%providerName">

<description url="http://www.jboss.org/tools">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.foundation</groupId>
<artifactId>features</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.foundation.features</groupId>
<artifactId>org.jboss.tools.foundation.license.feature</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.foundation.security.linux.feature"
label="%featureName"
version="1.6.1800.qualifier"
version="1.6.1900.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.foundation.security.linux"
license-feature="org.jboss.tools.foundation.license.feature"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.foundation</groupId>
<artifactId>features</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.foundation.features</groupId>
<artifactId>org.jboss.tools.foundation.security.linux.feature</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.foundation.test.feature"
label="%featureName"
version="1.6.1800.qualifier"
version="1.6.1900.qualifier"
provider-name="%providerName"
license-feature="org.jboss.tools.foundation.license.feature"
license-feature-version="0.0.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.foundation</groupId>
<artifactId>features</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.foundation.test.features</groupId>
<artifactId>org.jboss.tools.foundation.test.feature</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion foundation/features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>foundation</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<modules>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.ui.workbench;bundle-version="3.107.0",
org.eclipse.ui.views.log;bundle-version="1.0.600",
org.eclipse.jface
Bundle-Version: 1.6.1800.qualifier
Bundle-Version: 1.6.1900.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.foundation</groupId>
<artifactId>plugins</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.foundation.plugins</groupId>
<artifactId>org.jboss.tools.foundation.checkup</artifactId>
Expand Down
18 changes: 16 additions & 2 deletions foundation/plugins/org.jboss.tools.foundation.core/.classpath
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="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>
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Require-Bundle: org.eclipse.equinox.p2.core;bundle-version="2.2.0",
org.eclipse.ecf.provider.filetransfer.httpclient5;bundle-version="1.0.0",
org.eclipse.e4.core.contexts;bundle-version="1.5.0",
org.eclipse.e4.core.di;bundle-version="1.6.0"
Bundle-Version: 1.6.1800.qualifier
Bundle-Version: 1.6.1900.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-11
2 changes: 1 addition & 1 deletion foundation/plugins/org.jboss.tools.foundation.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.foundation</groupId>
<artifactId>plugins</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.foundation.plugins</groupId>
<artifactId>org.jboss.tools.foundation.core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# Red Hat, Inc. - initial API and implementation
##############################################################################
# set default.version to the same x.y.z base as the parent pom, then .${BUILD_ALIAS} or .Final
default.version=4.29.0.Final
default.version=4.30.0.Final
version=${jbosstools.version}
18 changes: 16 additions & 2 deletions foundation/plugins/org.jboss.tools.foundation.help.ui/.classpath
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
<?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.7"/>
<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 exported="true" kind="lib" path="lib/jboss-dmr-1.2.0.Final.jar"/>
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %BundleName
Bundle-Vendor: %BundleVendor
Bundle-SymbolicName: org.jboss.tools.foundation.help.ui;singleton:=true
Bundle-Version: 1.6.1800.qualifier
Bundle-Version: 1.6.1900.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.jboss.tools.foundation.help.ui.internal.JBossHelpActivator
Require-Bundle: org.eclipse.ui,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.tools.foundation</groupId>
<artifactId>plugins</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.foundation.plugins</groupId>
<artifactId>org.jboss.tools.foundation.help.ui</artifactId>
Expand Down
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.foundation.security.linux;singleton:=true
Bundle-Version: 1.6.1800.qualifier
Bundle-Version: 1.6.1900.qualifier
Bundle-Vendor: %providerName
Fragment-Host: org.eclipse.equinox.security;bundle-version="1.1.100"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.foundation</groupId>
<artifactId>plugins</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.foundation.plugins</groupId>
<artifactId>org.jboss.tools.foundation.security.linux</artifactId>
Expand Down
18 changes: 16 additions & 2 deletions foundation/plugins/org.jboss.tools.foundation.ui/.classpath
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
<?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 exported="true" kind="lib" path="lib/magicfile4j-1.0.0-Beta1.jar"/>
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
org.eclipse.jface.databinding;bundle-version="1.14.100",
org.eclipse.core.databinding.property;bundle-version="1.9.200",
org.eclipse.jface.notifications;bundle-version="0.5.200"
Bundle-Version: 1.6.1800.qualifier
Bundle-Version: 1.6.1900.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-11
Expand Down
4 changes: 2 additions & 2 deletions foundation/plugins/org.jboss.tools.foundation.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<parent>
<groupId>org.jboss.tools.foundation</groupId>
<artifactId>plugins</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.foundation.plugins</groupId>
<artifactId>org.jboss.tools.foundation.ui</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion foundation/plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>foundation</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion foundation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.jboss.tools</groupId>
<artifactId>foundation</artifactId>
<name>foundation.all</name>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>plugins</module>
Expand Down
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: Foundation Checkup Test
Bundle-SymbolicName: org.jboss.tools.foundation.checkup.test
Bundle-Version: 1.6.1800.qualifier
Bundle-Version: 1.6.1900.qualifier
Export-Package: org.jboss.tools.foundation.checkup.test
Require-Bundle: org.junit,
org.jboss.tools.foundation.checkup;bundle-version="1.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.foundation</groupId>
<artifactId>tests</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.foundation.tests</groupId>
<artifactId>org.jboss.tools.foundation.checkup.test</artifactId>
Expand Down
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: %BundleName
Bundle-SymbolicName: org.jboss.tools.foundation.core.test;singleton:=true
Bundle-Version: 1.6.1800.qualifier
Bundle-Version: 1.6.1900.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.junit;bundle-version="4.8.1",
org.eclipse.equinox.http.jetty;bundle-version="3.0.100",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.foundation</groupId>
<artifactId>tests</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.foundation.tests</groupId>
<artifactId>org.jboss.tools.foundation.core.test</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public void testTimeoutWithoutCancel() throws Exception {
URLTransportUtility util = new URLTransportUtility();
ByteArrayOutputStream os = new ByteArrayOutputStream();
long t1 = System.currentTimeMillis();
IStatus s = util.download("displayString", url, os, 500, monitor);
IStatus s = util.download("displayString", url, os, 600, monitor);
long t2 = System.currentTimeMillis();
assertTrue(s.getSeverity() == IStatus.ERROR);
assertTrue(t2 - t1 < 3000);
Expand Down Expand Up @@ -191,7 +191,7 @@ public void run() {
ByteArrayOutputStream os = new ByteArrayOutputStream();
IStatus s = util.download("displayString", url.toExternalForm(), os, monitor);
synchronized (times) {
times[1] = System.currentTimeMillis();
times[1] = System.currentTimeMillis();
}
assertTrue(s.getSeverity() == IStatus.CANCEL || s.getSeverity() == IStatus.ERROR);
// MUST cancel within 500 ms
Expand Down
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: JBoss Tools Help Plugin - Tests
Bundle-SymbolicName: org.jboss.tools.foundation.help.test
Bundle-Version: 1.6.1800.qualifier
Bundle-Version: 1.6.1900.qualifier
Fragment-Host: org.jboss.tools.foundation.help.ui;bundle-version="1.2.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.junit;bundle-version="4.11.0"
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.foundation</groupId>
<artifactId>tests</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.foundation.tests</groupId>
<artifactId>org.jboss.tools.foundation.help.test</artifactId>
Expand Down
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: Foundation UI Test
Bundle-SymbolicName: org.jboss.tools.foundation.ui.test;singleton:=true
Bundle-Version: 1.6.1800.qualifier
Bundle-Version: 1.6.1900.qualifier
Bundle-ClassPath: .
Export-Package: org.jboss.tools.foundation.ui.test
Require-Bundle: org.junit,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.foundation</groupId>
<artifactId>tests</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.foundation.tests</groupId>
<artifactId>org.jboss.tools.foundation.ui.test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion foundation/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>foundation</artifactId>
<version>1.6.1800-SNAPSHOT</version>
<version>1.6.1900-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.foundation</groupId>
<artifactId>tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jacoco-report/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<enforceExcludePatternExtras>|plugins.version.*</enforceExcludePatternExtras>
<plugins.version.common>3.18.0-SNAPSHOT</plugins.version.common>
<plugins.version.foundation>1.6.1800-SNAPSHOT</plugins.version.foundation>
<plugins.version.foundation>1.6.1900-SNAPSHOT</plugins.version.foundation>
<plugins.version.runtime>3.5.400-SNAPSHOT</plugins.version.runtime>
<plugins.version.stacks>1.4.300-SNAPSHOT</plugins.version.stacks>
<plugins.version.tests>3.7.103-SNAPSHOT</plugins.version.tests>
Expand Down

0 comments on commit df43ce1

Please sign in to comment.