JDT 3.37.0 in the BOM when using Java 21

eclipse · May 16, 2024 · 416e01b · 416e01b
1 parent 867e5ed
commit 416e01b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml
@@ -125,6 +125,7 @@
 		<url>git@github.com:eclipse/xtext.git</url>
 	</scm>
 	<properties>
+		<org.eclipse.jdt.core-version>3.33.0</org.eclipse.jdt.core-version>
 		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
 	</properties>
 	<dependencyManagement>
@@ -267,12 +268,12 @@
 			<dependency>
 				<groupId>org.eclipse.jdt</groupId>
 				<artifactId>ecj</artifactId>
-				<version>3.33.0</version>
+				<version>${org.eclipse.jdt.core-version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jdt</groupId>
 				<artifactId>org.eclipse.jdt.core</artifactId>
-				<version>3.33.0</version>
+				<version>${org.eclipse.jdt.core-version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jdt</groupId>
@@ -500,6 +501,18 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>java-21</id>
+			<activation>
+				<jdk>[21,)</jdk>
+			</activation>
+			<properties>
+				<!-- This version supports Java 21 but requires Java 17;
+					for the moment we activate it only when building with Java 21.
+					By default, we don't require Java 17 but only Java 11 -->
+				<org.eclipse.jdt.core-version>3.37.0</org.eclipse.jdt.core-version>
+			</properties>
+		</profile>
 	</profiles>
 
 	<distributionManagement>

diff --git a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/java-lang-21-bi-ref/pom.xml b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/java-lang-21-bi-ref/pom.xml
@@ -52,17 +52,6 @@
 						<artifactId>org.eclipse.xtext.purexbase</artifactId>
 						<version>${xtext-version}</version>
 					</dependency>
-					<!-- force the version of JDT that supports Java 21 -->
-					<dependency>
-						<groupId>org.eclipse.jdt</groupId>
-						<artifactId>ecj</artifactId>
-						<version>3.37.0</version>
-					</dependency>
-					<dependency>
-						<groupId>org.eclipse.jdt</groupId>
-						<artifactId>org.eclipse.jdt.core</artifactId>
-						<version>3.37.0</version>
-					</dependency>
 				</dependencies>
 			</plugin>
 		</plugins>