[#2174] update to 2023-03 platform maven artifacts

Signed-off-by: Christian Dietrich <[email protected]>
eclipse-xtext · Apr 4, 2023 · ea6196a · ea6196a
1 parent 9f79df3
commit ea6196a
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 54 deletions.
diff --git a/org.eclipse.xtend.core/pom.xml b/org.eclipse.xtend.core/pom.xml
@@ -29,15 +29,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
+			<artifactId>ecj</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
+			<artifactId>org.eclipse.jdt.core</artifactId>
 		</dependency>
 	</dependencies>
 

diff --git a/org.eclipse.xtext.builder.standalone/pom.xml b/org.eclipse.xtext.builder.standalone/pom.xml
@@ -32,15 +32,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
+			<artifactId>ecj</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
+			<artifactId>org.eclipse.jdt.core</artifactId>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/org.eclipse.xtext.common.types.tests/pom.xml b/org.eclipse.xtext.common.types.tests/pom.xml
@@ -53,15 +53,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
+			<artifactId>ecj</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
+			<artifactId>org.eclipse.jdt.core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.google.errorprone</groupId>

diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml
@@ -264,18 +264,6 @@
 				<artifactId>ecj</artifactId>
 				<version>3.33.0</version>
 			</dependency>
-			<!--
-			<dependency>
-				<groupId>org.eclipse.jdt</groupId>
-				<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-				<version>1.4.200</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jdt</groupId>
-				<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
-				<version>1.3.200</version>
-			</dependency>
-			-->
 			<dependency>
 				<groupId>org.eclipse.jdt</groupId>
 				<artifactId>org.eclipse.jdt.core</artifactId>

diff --git a/org.eclipse.xtext.java/pom.xml b/org.eclipse.xtext.java/pom.xml
@@ -27,15 +27,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
+			<artifactId>ecj</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
+			<artifactId>org.eclipse.jdt.core</artifactId>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/bug463946/pom.xml b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/bug463946/pom.xml
@@ -95,13 +95,13 @@
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.jdt</groupId>
-						<artifactId>org.eclipse.jdt.core</artifactId>
+						<artifactId>ecj</artifactId>
 						<version>${jdt-core-version}</version>
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.jdt</groupId>
-						<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-						<version>${jdt-compiler-apt-version}</version>
+						<artifactId>org.eclipse.jdt.core</artifactId>
+						<version>${jdt-core-version}</version>
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.emf</groupId>

diff --git a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml
@@ -14,9 +14,9 @@
 		<maven.compiler.target>11</maven.compiler.target>
 		<xtext-version>2.31.0-SNAPSHOT</xtext-version>
 		<tycho-version>2.7.5</tycho-version>
-		<eclipse-text-version>3.12.200</eclipse-text-version>
-		<core-resources-version>3.18.0</core-resources-version>
-		<core-runtime-version>3.26.0</core-runtime-version>
+		<eclipse-text-version>3.12.300</eclipse-text-version>
+		<core-resources-version>3.18.200</core-resources-version>
+		<core-runtime-version>3.26.100</core-runtime-version>
 		<emf-common-version>2.24.0</emf-common-version>
 		<emf-ecore-version>2.26.0</emf-ecore-version>
 		<emf-edit-version>2.17.0</emf-edit-version>
@@ -27,9 +27,8 @@
 		<ecore-xcore-version>1.20.0</ecore-xcore-version>
 		<ecore-xcore-lib-version>1.6.0</ecore-xcore-lib-version>
 		<ecore-xtext-version>1.6.0</ecore-xtext-version>
-		<jdt-core-version>3.31.0</jdt-core-version>
-		<jdt-compiler-apt-version>1.4.200</jdt-compiler-apt-version>
-		<platform-osgi-version>3.18.100</platform-osgi-version>
+		<jdt-core-version>3.33.0</jdt-core-version>
+		<platform-osgi-version>3.18.300</platform-osgi-version>
 	</properties>
 
 	<dependencyManagement>

diff --git a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-lang/pom.xml b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-lang/pom.xml
@@ -97,13 +97,13 @@
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.jdt</groupId>
-						<artifactId>org.eclipse.jdt.core</artifactId>
+						<artifactId>ecj</artifactId>
 						<version>${jdt-core-version}</version>
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.jdt</groupId>
-						<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-						<version>${jdt-compiler-apt-version}</version>
+						<artifactId>org.eclipse.jdt.core</artifactId>
+						<version>${jdt-core-version}</version>
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.emf</groupId>

diff --git a/org.eclipse.xtext.xbase.testing/pom.xml b/org.eclipse.xtext.xbase.testing/pom.xml
@@ -36,15 +36,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
+			<artifactId>ecj</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
+			<artifactId>org.eclipse.jdt.core</artifactId>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/node/TracedAccessorsProcessor.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/node/TracedAccessorsProcessor.java
@@ -63,6 +63,7 @@ public void doTransform(MutableClassDeclaration annotatedClass, @Extension Trans
 					if (TracedAccessorsProcessor.TYPES_WITH_GOOD_TO_STRING
 							.contains(rt.getType().getSimpleName().toLowerCase())) {
 						annotatedClass.addMethod(tracerName(getter), it -> {
+							context.setPrimarySourceElement(it, context.getPrimarySourceElement(annotatedClass));
 							it.setReturnType(context.newTypeReference(IGeneratorNode.class));
 							it.addParameter("target", t);
 							it.setBody(new StringConcatenationClient() {
@@ -89,6 +90,7 @@ protected void appendTo(TargetStringConcatenation builder) {
 							});
 						});
 						annotatedClass.addMethod(tracerName(getter), it -> {
+							context.setPrimarySourceElement(it, context.getPrimarySourceElement(annotatedClass));
 							it.setReturnType(context.newTypeReference(IGeneratorNode.class));
 							it.addParameter("target", t);
 							it.addParameter("useForDebugging", context.newTypeReference(Boolean.TYPE));
@@ -117,6 +119,7 @@ protected void appendTo(TargetStringConcatenation builder) {
 						});
 					}
 					annotatedClass.addMethod(this.tracerName(getter), (MutableMethodDeclaration it) -> {
+						context.setPrimarySourceElement(it, context.getPrimarySourceElement(annotatedClass));
 						it.setReturnType(context.newTypeReference(IGeneratorNode.class));
 						it.addParameter("target", t);
 						it.addParameter("stringProvider",