Update to build with latest dependencies

Also use the latest tools for the build itself. #108
eclipse · Nov 21, 2023 · 82893b1 · 82893b1
1 parent dd9ab0e
commit 82893b1
Show file tree

Hide file tree

Showing 117 changed files with 803 additions and 557 deletions.
diff --git a/org.eclipse.gef.cloudio.doc-feature/pom.xml b/org.eclipse.gef.cloudio.doc-feature/pom.xml
@@ -27,8 +27,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho.version}</version>
 				<configuration>
 					<skip>true</skip>

diff --git a/org.eclipse.gef.cloudio.doc.user-feature/pom.xml b/org.eclipse.gef.cloudio.doc.user-feature/pom.xml
@@ -27,8 +27,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho.version}</version>
 				<configuration>
 					<skip>true</skip>

diff --git a/org.eclipse.gef.cloudio.doc/javadocOptions.txt b/org.eclipse.gef.cloudio.doc/javadocOptions.txt
@@ -11,7 +11,7 @@
 -doctitle "GEF Cloudio API Reference"
 -header "<b>GEF Cloudio</b><br>@build@"
 -bottom "Copyright (c) 2000, 2012 itemis AG and others. All rights reserved."
--link http://docs.oracle.com/javase/8/docs/api/
+-link https://docs.oracle.com/javase/8/docs/api/
 -linkoffline PLUGINS_ROOT/org.eclipse.platform.doc.isv/reference/api/ @linkoffline-target@/org.eclipse.platform.doc.isv/reference/api/
 
 org.eclipse.gef.cloudio.internal.ui

diff --git a/org.eclipse.gef.cloudio.sdk-feature/pom.xml b/org.eclipse.gef.cloudio.sdk-feature/pom.xml
@@ -27,8 +27,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho.version}</version>
 				<configuration>
 					<skip>true</skip>

diff --git a/org.eclipse.gef.cloudio.user-feature/pom.xml b/org.eclipse.gef.cloudio.user-feature/pom.xml
@@ -27,8 +27,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho.version}</version>
 				<configuration>
 					<skip>true</skip>

diff --git a/org.eclipse.gef.common-feature/feature.xml b/org.eclipse.gef.common-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.gef.common"
       label="GEF Common"
-      version="5.0.2.qualifier"
+      version="5.0.3.qualifier"
       provider-name="Eclipse GEF"
       plugin="org.eclipse.gef.common"
       license-feature="org.eclipse.license"
@@ -33,7 +33,7 @@
 
    <requires>
       <import plugin="com.google.guava" version="12.0.0" match="greaterOrEqual"/>
-      <import plugin="com.google.inject" version="5.0.0" match="compatible"/>
+      <import plugin="com.google.inject" version="7.0.0" match="compatible"/>
       <import feature="org.eclipse.fx.runtime.min.feature" version="2.0.0" match="greaterOrEqual"/>
    </requires>
 

diff --git a/org.eclipse.gef.common-feature/pom.xml b/org.eclipse.gef.common-feature/pom.xml
@@ -22,6 +22,6 @@
 	</parent>
 	<groupId>org.eclipse.gef.features</groupId>
 	<artifactId>org.eclipse.gef.common</artifactId>
-	<version>5.0.2-SNAPSHOT</version>
+	<version>5.0.3-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.gef.common.doc-feature/pom.xml b/org.eclipse.gef.common.doc-feature/pom.xml
@@ -27,8 +27,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho.version}</version>
 				<configuration>
 					<skip>true</skip>

diff --git a/org.eclipse.gef.common.doc/META-INF/MANIFEST.MF b/org.eclipse.gef.common.doc/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GEF Common Developer Documentation
 Bundle-SymbolicName: org.eclipse.gef.common.doc;singleton:=true
-Bundle-Version: 5.0.2.qualifier
+Bundle-Version: 5.0.3.qualifier
 Bundle-Vendor: Eclipse GEF
 Import-Package: com.google.common.collect;version="12.0.0";resolution:=optional,
  com.google.common.reflect;version="12.0.0";resolution:=optional,
- com.google.inject;version="[5.0.0,6.0.0)";resolution:=optional,
- com.google.inject.matcher;version="[5.0.0,6.0.0)";resolution:=optional,
- com.google.inject.multibindings;version="[5.0.0,6.0.0)";resolution:=optional,
- com.google.inject.spi;version="[5.0.0,6.0.0)";resolution:=optional,
- javax.inject;version="[1.0.0,2.0.0)";resolution:=optional
+ com.google.inject;version="[1.4.0,2.0.0)";resolution:=optional,
+ com.google.inject.matcher;version="[1.4.0,2.0.0)";resolution:=optional,
+ com.google.inject.multibindings;version="[1.4.0,2.0.0)";resolution:=optional,
+ com.google.inject.spi;version="[1.4.0,2.0.0)";resolution:=optional,
+ jakarta.inject;version="[2.0.0,3.0.0)";resolution:=optional
diff --git a/org.eclipse.gef.common.doc/javadocOptions.txt b/org.eclipse.gef.common.doc/javadocOptions.txt
@@ -11,10 +11,10 @@
 -doctitle "GEF Common API Reference"
 -header "<b>GEF Common</b><br>@build@"
 -bottom "Copyright (c) 2014 itemis AG and others. All rights reserved."
--link http://docs.oracle.com/javase/8/docs/api/
--link http://docs.oracle.com/javafx/2/api/
+-link https://docs.oracle.com/javase/8/docs/api/
+-link https://docs.oracle.com/javafx/2/api/
 -link https://guava.dev/releases/15.0/api/docs/
--link http://google.github.io/guice/api-docs/3.0/javadoc/
+-link https://google.github.io/guice/api-docs/3.0/javadoc/
 
 org.eclipse.gef.common.activate
 org.eclipse.gef.common.adapt

diff --git a/org.eclipse.gef.common.doc/pom.xml b/org.eclipse.gef.common.doc/pom.xml
@@ -22,7 +22,7 @@
 	</parent>
 	<groupId>org.eclipse.gef.plugins</groupId>
 	<artifactId>org.eclipse.gef.common.doc</artifactId>
-	<version>5.0.2-SNAPSHOT</version>
+	<version>5.0.3-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<build>
 		<plugins>

diff --git a/org.eclipse.gef.common.sdk-feature/pom.xml b/org.eclipse.gef.common.sdk-feature/pom.xml
@@ -27,8 +27,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho.version}</version>
 				<configuration>
 					<skip>true</skip>

diff --git a/org.eclipse.gef.common.tests/META-INF/MANIFEST.MF b/org.eclipse.gef.common.tests/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GEF Common Tests
 Bundle-SymbolicName: org.eclipse.gef.common.tests
-Bundle-Version: 5.0.2.qualifier
+Bundle-Version: 5.0.3.qualifier
 Bundle-Vendor: Eclipse GEF
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.gef.common;bundle-version="[5.0.0,6.0.0)"
 Import-Package: com.google.common.collect;version="12.0.0",
  com.google.common.reflect;version="12.0.0",
- com.google.inject;version="[5.0.0,6.0.0)",
- com.google.inject.binder;version="[5.0.0,6.0.0)",
- com.google.inject.multibindings;version="[5.0.0,6.0.0)",
- com.google.inject.spi;version="[5.0.0,6.0.0)",
- javax.inject;version="[1.0.0,2.0.0)"
+ com.google.inject;version="[1.4.0,2.0.0)",
+ com.google.inject.binder;version="[1.4.0,2.0.0)",
+ com.google.inject.multibindings;version="[1.4.0,2.0.0)",
+ com.google.inject.spi;version="[1.4.0,2.0.0)",
+ jakarta.inject;version="[2.0.0,3.0.0)"
diff --git a/org.eclipse.gef.common.tests/pom.xml b/org.eclipse.gef.common.tests/pom.xml
@@ -22,7 +22,7 @@
 	</parent>
 	<groupId>org.eclipse.gef.plugins</groupId>
 	<artifactId>org.eclipse.gef.common.tests</artifactId>
-	<version>5.0.2-SNAPSHOT</version>
+	<version>5.0.3-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<build>
 		<plugins>

diff --git a/org.eclipse.gef.common/META-INF/MANIFEST.MF b/org.eclipse.gef.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GEF Common
 Bundle-SymbolicName: org.eclipse.gef.common
-Bundle-Version: 5.0.2.qualifier
+Bundle-Version: 5.0.3.qualifier
 Bundle-Vendor: Eclipse GEF
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.gef.common.activate,
@@ -18,9 +18,9 @@ Export-Package: org.eclipse.gef.common.activate,
 Import-Package: com.google.common.base;version="12.0.0",
  com.google.common.collect;version="12.0.0",
  com.google.common.reflect;version="12.0.0",
- com.google.inject;version="[5.0.0,6.0.0)",
- com.google.inject.matcher;version="[5.0.0,6.0.0)",
- com.google.inject.multibindings;version="[5.0.0,6.0.0)",
- com.google.inject.spi;version="[5.0.0,6.0.0)",
- javax.inject;version="[1.0.0,2.0.0)"
+ com.google.inject;version="[1.4.0,2.0.0)",
+ com.google.inject.matcher;version="[1.4.0,2.0.0)",
+ com.google.inject.multibindings;version="[1.4.0,2.0.0)",
+ com.google.inject.spi;version="[1.4.0,2.0.0)",
+ jakarta.inject;version="[2.0.0,3.0.0)"
 Eclipse-BuddyPolicy: dependent
diff --git a/org.eclipse.gef.common/pom.xml b/org.eclipse.gef.common/pom.xml
@@ -22,6 +22,6 @@
 	</parent>
 	<groupId>org.eclipse.gef.plugins</groupId>
 	<artifactId>org.eclipse.gef.common</artifactId>
-	<version>5.0.2-SNAPSHOT</version>
+	<version>5.0.3-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.gef.dot.doc-feature/pom.xml b/org.eclipse.gef.dot.doc-feature/pom.xml
@@ -27,8 +27,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho.version}</version>
 				<configuration>
 					<skip>true</skip>

diff --git a/org.eclipse.gef.dot.doc.user-feature/pom.xml b/org.eclipse.gef.dot.doc.user-feature/pom.xml
@@ -27,8 +27,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho.version}</version>
 				<configuration>
 					<skip>true</skip>

diff --git a/org.eclipse.gef.dot.doc/META-INF/MANIFEST.MF b/org.eclipse.gef.dot.doc/META-INF/MANIFEST.MF
@@ -4,7 +4,8 @@ Bundle-Name: GEF DOT Developer Documentation
 Bundle-SymbolicName: org.eclipse.gef.dot.doc;singleton:=true
 Bundle-Version: 5.1.3.qualifier
 Bundle-Vendor: Eclipse GEF
-Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
+Require-Bundle: org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)";resolution:=optional,
+ org.antlr.runtime;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
  org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)";resolution:=optional,
  org.eclipse.core.filesystem;bundle-version="[1.4.0,2.0.0)";resolution:=optional,
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)";resolution:=optional,

diff --git a/org.eclipse.gef.dot.doc/javadocOptions.txt b/org.eclipse.gef.dot.doc/javadocOptions.txt
@@ -11,7 +11,7 @@
 -doctitle "GEF DOT API Reference"
 -header "<b>GEF DOT</b><br>@build@"
 -bottom "Copyright (c) 2014 itemis AG and others. All rights reserved."
--link http://docs.oracle.com/javase/8/docs/api/
+-link https://docs.oracle.com/javase/8/docs/api/
 -linkoffline PLUGINS_ROOT/org.eclipse.platform.doc.isv/reference/api/ @linkoffline-target@/org.eclipse.platform.doc.isv/reference/api/
 
 org.eclipse.gef.dot.internal

diff --git a/org.eclipse.gef.dot.sdk-feature/pom.xml b/org.eclipse.gef.dot.sdk-feature/pom.xml
@@ -27,8 +27,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho.version}</version>
 				<configuration>
 					<skip>true</skip>

diff --git a/org.eclipse.gef.dot.tests/META-INF/MANIFEST.MF b/org.eclipse.gef.dot.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.gef.dot.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: GEF DOT Tests
 Bundle-SymbolicName: org.eclipse.gef.dot.tests
-Bundle-Version: 5.1.4.qualifier
+Bundle-Version: 5.1.5.qualifier
 Bundle-Vendor: Eclipse GEF
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
@@ -37,8 +37,9 @@ Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.xtext.xbase.testing;bundle-version="[2.17.0,3.0.0)",
  org.eclipse.xtext.testing;bundle-version="[2.17.0,3.0.0)",
  org.eclipse.xtext.junit4;bundle-version="[2.17.0,3.0.0)",
- org.eclipse.xtext.ui.testing;bundle-version="[2.17.0,3.0.0)"
-Import-Package: org.hamcrest.core;version="[1.3.0,2.0.0)",
+ org.eclipse.xtext.ui.testing;bundle-version="[2.17.0,3.0.0)",
+ org.eclipse.xtext.xbase.ui.testing
+Import-Package: org.hamcrest.core;version="[2.0.0,3.0.0)",
  org.junit.runner;version="4.5.0",
  org.junit.runner.manipulation;version="4.5.0",
  org.junit.runner.notification;version="4.5.0",

diff --git a/org.eclipse.gef.dot.tests/pom.xml b/org.eclipse.gef.dot.tests/pom.xml
@@ -23,7 +23,7 @@
 		<relativePath>../org.eclipse.gef.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.gef.dot.tests</artifactId>
-	<version>5.1.4-SNAPSHOT</version>
+	<version>5.1.5-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<profiles>
 		<profile>

diff --git a/...se.gef.dot.tests/src/org/eclipse/gef/dot/tests/Dot2ZestNodeAttributesConversionTest.xtend b/...se.gef.dot.tests/src/org/eclipse/gef/dot/tests/Dot2ZestNodeAttributesConversionTest.xtend
@@ -36,6 +36,7 @@ import org.junit.runner.RunWith
 
 import static extension org.eclipse.gef.zest.fx.ZestProperties.*
 import static extension org.junit.Assert.*
+import static org.junit.Assume.assumeNoException
 
 /**
  * Test cases for the {@link Dot2ZestAttributesConverter#convertAttributes(Node, Node)} method.
@@ -57,7 +58,7 @@ class Dot2ZestNodeAttributesConversionTest {
 	//public FXNonApplicationThreadRule ctx = new FXNonApplicationThreadRule
 	@BeforeClass
 	def static void setup() {
-		Assume.assumeTrue(!DotTestUtils.runningOnWindows)
+		// Assume.assumeTrue(!DotTestUtils.runningOnWindows)
 	}
 
 	@Rule public val rule = new DotSubgrammarPackagesRegistrationRule
@@ -1003,8 +1004,18 @@ class Dot2ZestNodeAttributesConversionTest {
 	}
 
 	private def assertNodeStyle(CharSequence dotText, String expected) {
-		val actual = dotText.firstNode.convert.shape.style
-		expected.assertEquals(actual.split)
+		try {
+			val actual = dotText.firstNode.convert.shape.style
+			expected.assertEquals(actual.split)
+		} catch (NullPointerException ex) {
+			// TODO JavaFX-Bug
+			// Cannot invoke "com.sun.glass.ui.Timer.resume()" because "this.pulseTimer" is null
+			// 
+			if (!ex.message.contains("com.sun.glass.ui.Timer")) {
+				throw ex;
+			}
+			assumeNoException("Expected framework error", ex);
+		}
 	}
 
 	private def assertNodeTooltip(CharSequence dotText, String expected) {