Merge branch 'master' into BETA_JAVA23

jarthana · Aug 13, 2024 · 5c13046 · 5c13046
2 parents 375b57a + 49f2240
commit 5c13046
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 102 deletions.
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java
@@ -731,7 +731,7 @@ private void launchJavaTarget() {
 
 			Vector<String> commandLine = new Vector<>();
 
-			commandLine.add(binDirectory + "javaw");
+			commandLine.add(binDirectory + "java");
 			if (fBootPath.length() > 0) {
 				commandLine.add("-bootpath");
 				commandLine.add(fBootPath);

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsPreferencePage.java
@@ -15,7 +15,6 @@
 
 
 import java.io.File;
-import java.util.List;
 
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IStatus;
@@ -198,8 +197,7 @@ private void validateComplianceAndJRE(IVMInstall vmInstall) {
 			fCompliance.setVisible(true);
 		}
 		else {
-			List<String> allVersions = JavaCore.getAllJavaSourceVersionsSupportedByCompiler();
-			String latest = allVersions.get(allVersions.size() - 1);
+			String latest = JavaCore.getAllJavaSourceVersionsSupportedByCompiler().last();
 			String vmver = null;
 			if (vmInstall instanceof AbstractVMInstall) {
 				AbstractVMInstall vm = (AbstractVMInstall) vmInstall;

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMPage.java
@@ -16,7 +16,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-import java.util.List;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
@@ -247,8 +246,7 @@ else if (segs >= 2) {
 		}
 		detectJavadocLocation();
 		if (s.isOK()) {
-			List<String> allVersions = JavaCore.getAllJavaSourceVersionsSupportedByCompiler();
-			String latest = allVersions.get(allVersions.size() - 1);
+			String latest = JavaCore.getAllJavaSourceVersionsSupportedByCompiler().last();
 			IVMInstallType vmType = fVM.getVMInstallType();
 			if (vmType instanceof StandardVMType) {
 				String vmver = ((StandardVMType) vmType).readReleaseVersion(getInstallLocation());

diff --git a/org.eclipse.jdt.launching.javaagent/pom.xml b/org.eclipse.jdt.launching.javaagent/pom.xml
@@ -33,17 +33,16 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.12.1</version>
+        <version>3.13.0</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <release>8</release>
         </configuration>
       </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifestEntries>
@@ -56,7 +55,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.5.2</version>
+        <version>3.6.0</version>
         <executions>
           <execution>
             <phase>package</phase>

diff --git a/...aagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java b/...aagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java
@@ -25,7 +25,7 @@ public class ClassfileTransformer {
 	private static final String STRATA_ID = "jdt"; //$NON-NLS-1$
 
 	/** max supported java class format major version, must match {@link #ASM_API} below **/
-	public static final int MAX_CLASS_MAJOR = Opcodes.V22;
+	public static final int MAX_CLASS_MAJOR = Opcodes.V23;
 
 	/** supported ASM API version, must match {@link #MAX_CLASS_MAJOR} above */
 	private static final int ASM_API = Opcodes.ASM9;