Merge branch 'master' into swtbot

.github/workflows/junit.yml

@@ -45,7 +45,7 @@ jobs:
            done
 
       - name: Publish Test Results
-        uses: EnricoMi/publish-unit-test-result-action@567cc7f8dcea3eba5da355f6ebc95663310d8a07 # v2.17.0
+        uses: EnricoMi/publish-unit-test-result-action@82082dac68ad6a19d980f8ce817e108b9f496c2a # v2.17.1
         with:
           commit: ${{ github.event.workflow_run.head_sha }}
           event_file: artifacts/Event File/event.json

.github/workflows/maven.yml

@@ -20,11 +20,11 @@ jobs:
     timeout-minutes: 45
 
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       with:
         fetch-depth: 0
         submodules: true
-    - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+    - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
         java-version: |
           17
@@ -33,7 +33,7 @@ jobs:
     - name: Set up Maven
       uses: stCarolas/setup-maven@v5
       with:
-        maven-version: 3.9.6
+        maven-version: 3.9.9
     - name: Cache local Maven repository
       uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
@@ -51,7 +51,7 @@ jobs:
            -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true
            -Dtycho.surefire.deleteWorkDir=true
     - name: Upload Test Results
-      uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+      uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
       with:
         name: test-results-${{ matrix.os }}
         if-no-files-found: warn
@@ -62,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Upload
-      uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+      uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
       with:
         name: Event File
         path: ${{ github.event_path }}

.mvn/maven.config

@@ -5,4 +5,4 @@
 --fail-at-end
 -Dtycho.localArtifacts=ignore
 -Dtycho.target.pomDependencies=consider
--Dtycho-version=4.0.4
+-Dtycho-version=4.0.9

Jenkinsfile

@@ -6,10 +6,10 @@ pipeline {
 		timestamps()
 	}
 	agent {
-		label "centos-latest"
+		label "ubuntu-latest"
 	}
 	tools {
-		maven 'apache-maven-3.9.6'
+		maven 'apache-maven-3.9.9'
 		jdk 'openjdk-jdk21-latest'
 	}
 	stages {

RELEASE_NOTES.md

@@ -2,7 +2,7 @@
 
 ## 2.6.2
 
-* 📅 Release Date: _expected_ beginning of September 2024
+* 📅 Release Date: 04th September 2024
 
 ### Embedded and use Maven 3.9.9
 

org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.m2e.apt.core;singleton:=true
-Bundle-Version: 2.2.202.qualifier
+Bundle-Version: 2.2.203.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)",
  org.eclipse.core.resources,

org.eclipse.m2e.apt.tests/projects/argumentMap/pom.xml

@@ -8,10 +8,9 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.4</version>
+				<version>3.13.0</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<release>11</release>
 					<compilerArgument>-AaddGeneratedAnnotation=true</compilerArgument>
 					<compilerArguments>
 						<AaddGeneratedAnnotation>false</AaddGeneratedAnnotation>

org.eclipse.m2e.apt.tests/projects/nonjar_plugin_deps/pom.xml

@@ -26,10 +26,9 @@
 			<plugins>
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.1</version>
+					<version>3.13.0</version>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<release>11</release>
 					</configuration>
 					<dependencies>
 						<!-- Dummy dependency to trigger bug -->

org.eclipse.m2e.apt.tests/projects/p1/pom.xml

@@ -8,10 +8,12 @@
       <plugins>
         <plugin>
             <artifactId>maven-compiler-plugin</artifactId>
-            <version>2.3.2</version>
+            <version>3.13.0</version>
             <configuration>
-                <source>1.6</source>
-                <target>1.6</target>
+                <release>11</release>
+                <compilerArguments>
+                    <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                </compilerArguments>
             </configuration>
         </plugin>
       </plugins>

org.eclipse.m2e.apt.tests/projects/p11/pom.xml

@@ -11,10 +11,9 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.5</version>
+				<version>3.13.0</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<release>11</release>
 					<annotationProcessorPaths>
 						<path>
 						  <groupId>org.hibernate</groupId>

org.eclipse.m2e.apt.tests/projects/p12/new-pom.xml

@@ -11,10 +11,9 @@
       <plugins>
         <plugin>
             <artifactId>maven-compiler-plugin</artifactId>
-            <version>2.3.2</version>
+            <version>3.13.0</version>
             <configuration>
-                <source>1.6</source>
-                <target>1.6</target>
+                <release>11</release>
             </configuration>
         </plugin>
       </plugins>

org.eclipse.m2e.apt.tests/projects/p12/pom.xml

@@ -11,10 +11,9 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.13.0</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<release>11</release>
 					<compilerArgument>-proc:none</compilerArgument>
 				</configuration>
 			</plugin>

org.eclipse.m2e.apt.tests/projects/p1_test_classpath_disabled/pom.xml

@@ -11,10 +11,9 @@
       <plugins>
         <plugin>
             <artifactId>maven-compiler-plugin</artifactId>
-            <version>2.3.2</version>
+            <version>3.13.0</version>
             <configuration>
-                <source>1.6</source>
-                <target>1.6</target>
+                <release>11</release>
             </configuration>
         </plugin>
       </plugins>

org.eclipse.m2e.apt.tests/projects/p2/pom.xml

@@ -8,10 +8,9 @@
       <plugins>
         <plugin>
             <artifactId>maven-compiler-plugin</artifactId>
-            <version>2.3.2</version>
+            <version>3.13.0</version>
             <configuration>
-                <source>1.6</source>
-                <target>1.6</target>
+                <release>11</release>
                 <generatedSourcesDirectory>target/generated-sources/m2e-apt/</generatedSourcesDirectory>
                 <generatedTestSourcesDirectory>target/generated-test-sources/m2e-apt/</generatedTestSourcesDirectory>
             </configuration>

org.eclipse.m2e.apt.tests/projects/p3/pom.xml

@@ -8,10 +8,9 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.13.0</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<release>11</release>
 					<compilerArgument>-proc:none</compilerArgument>
 				</configuration>
 			</plugin>

org.eclipse.m2e.apt.tests/projects/p8/pom.xml

@@ -11,10 +11,9 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.13.0</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<release>11</release>
 					<compilerArgument>-proc:none</compilerArgument>
 				</configuration>
 			</plugin>

org.eclipse.m2e.apt.tests/src/org/eclipse/m2e/apt/tests/M2eAptProjectconfiguratorTest.java

@@ -54,7 +54,7 @@ public class M2eAptProjectconfiguratorTest extends AbstractM2eAptProjectConfigur
 	public void testMavenCompilerPluginSupport() throws Exception {
 		// Note: this is the old default, in new plugin versions it is
 		// "target/generated-test-sources/test-annotations"
-		defaultTest("p1", COMPILER_OUTPUT_DIR, "target/generated-sources/test-annotations");
+		defaultTest("p1", COMPILER_OUTPUT_DIR, "target/generated-test-sources/test-annotations");
 	}
 
 	@Test

org.eclipse.m2e.apt.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.m2e.apt.ui;singleton:=true
-Bundle-Version: 2.0.402.qualifier
+Bundle-Version: 2.0.403.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.m2e.core.ui;singleton:=true
-Bundle-Version: 2.0.801.qualifier
+Bundle-Version: 2.0.802.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor

org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/WorkingSetGroup.java

@@ -131,7 +131,7 @@ public Image getImage(Object element) {
           ImageDescriptor imageDescriptor = workingSet.getImageDescriptor();
           if(imageDescriptor != null) {
             try {
-              return (Image) images.create(imageDescriptor);
+              return images.create(imageDescriptor);
             } catch(DeviceResourceException ex) {
               return null;
             }

org.eclipse.m2e.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.m2e.core;singleton:=true
-Bundle-Version: 2.6.1.qualifier
+Bundle-Version: 2.6.2.qualifier
 Bundle-Activator: org.eclipse.m2e.core.internal.MavenPluginActivator
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin

org.eclipse.m2e.core/pom.xml

@@ -19,7 +19,7 @@
 	</parent>
 
 	<artifactId>org.eclipse.m2e.core</artifactId>
-	<version>2.6.1-SNAPSHOT</version>
+	<version>2.6.2-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<name>Maven Integration for Eclipse Core Plug-in</name>

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java

@@ -974,7 +974,7 @@ static class Context {
   }
 
   private MavenExecutionRequest configureExecutionRequest(MavenExecutionRequest request, IProjectRegistry state,
-      IFile pom, IProjectConfiguration resolverConfiguration) throws CoreException {
+      IFile pom, IProjectConfiguration resolverConfiguration) {
     if(pom != null) {
       request.setPom(ProjectRegistryManager.toJavaIoFile(pom));
     }

org.eclipse.m2e.discovery/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.m2e.discovery;singleton:=true
-Bundle-Version: 2.0.202.qualifier
+Bundle-Version: 2.0.203.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin

org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java

@@ -153,8 +153,8 @@ public static LifecycleMappingMetadataSource getLifecycleMappingMetadataSource(C
       }
       // To ensure we can delete the temporary file we need to prevent caching, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4386865
       URLConnection conn = url.openConnection();
-      if(conn instanceof JarURLConnection) {
-        ((JarURLConnection) conn).setDefaultUseCaches(false);
+      if(conn instanceof JarURLConnection jarConn) {
+        jarConn.setDefaultUseCaches(false);
       }
       try (InputStream is = conn.getInputStream()) {
         return LifecycleMappingFactory.createLifecycleMappingMetadataSource(is);

org.eclipse.m2e.editor/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.m2e.editor;singleton:=true
-Bundle-Version: 2.0.401.qualifier
+Bundle-Version: 2.0.402.qualifier
 Bundle-Activator: org.eclipse.m2e.editor.MavenEditorPlugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)",
  org.eclipse.core.resources,

org.eclipse.m2e.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.m2e.feature"
       label="%featureName"
-      version="2.6.2.qualifier"
+      version="2.6.3.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.m2e.core"
       license-feature="org.eclipse.license"

org.eclipse.m2e.jdt.tests/projects/compilerWarnings/pom.xml

@@ -13,7 +13,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.10.1</version>
+					<version>3.13.0</version>
 					<configuration>
 						<compilerArgs>
 							<compilerArg>-warn:-serial</compilerArg>

org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.m2e.jdt.ui;singleton:=true
-Bundle-Version: 2.0.401.qualifier
+Bundle-Version: 2.0.402.qualifier
 Bundle-Localization: plugin
 Export-Package: org.eclipse.m2e.jdt.ui.internal;x-internal:=true,
  org.eclipse.m2e.jdt.ui.internal.actions;x-internal:=true,

org.eclipse.m2e.jdt/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.m2e.jdt;singleton:=true
-Bundle-Version: 2.3.600.qualifier
+Bundle-Version: 2.3.601.qualifier
 Bundle-Localization: plugin
 Export-Package: org.eclipse.m2e.jdt,
  org.eclipse.m2e.jdt.internal;x-friends:="org.eclipse.m2e.jdt.ui",

org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java

@@ -114,11 +114,8 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
     List<String> sources = new ArrayList<>();
 
     List<String> targets = new ArrayList<>();
-    //Special case
-    targets.add("jsr14"); //$NON-NLS-1$
-    ENVIRONMENTS.put("jsr14", "J2SE-1.5"); //$NON-NLS-1$ //$NON-NLS-2$
 
-    List<String> releases = new ArrayList<>(List.of("6", "7", "8"));
+    List<String> releases = new ArrayList<>(List.of("8"));
 
     for(IExecutionEnvironment ee : JavaRuntime.getExecutionEnvironmentsManager().getExecutionEnvironments()) {
       String eeId = ee.getId();
@@ -144,7 +141,7 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
     RELEASES = Collections.unmodifiableList(releases);
   }
 
-  protected static final String DEFAULT_COMPILER_LEVEL = "1.5"; //$NON-NLS-1$
+  protected static final String DEFAULT_COMPILER_LEVEL = "1.8"; //$NON-NLS-1$
 
   private static final QualifiedName LINKED_MAVEN_RESOURCE = new QualifiedName(MavenJdtPlugin.PLUGIN_ID,
       "linkedSource");

org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java

@@ -74,13 +74,13 @@ public class JavaProjectConversionParticipant extends AbstractProjectConversionP
 
   private static final String DEFAULT_TEST_RESOURCES = "src/test/resources"; //$NON-NLS-1$
 
-  private static final String DEFAULT_JAVA_VERSION = "1.5"; //$NON-NLS-1$
+  private static final String DEFAULT_JAVA_VERSION = "1.8"; //$NON-NLS-1$
 
   private static final String COMPILER_GROUP_ID = "org.apache.maven.plugins"; //$NON-NLS-1$
 
   private static final String COMPILER_ARTIFACT_ID = "maven-compiler-plugin"; //$NON-NLS-1$
 
-  private static final String DEFAULT_COMPILER_VERSION = "3.8.1"; //$NON-NLS-1$
+  private static final String DEFAULT_COMPILER_VERSION = "3.13.0"; //$NON-NLS-1$
 
   private static final String TARGET_KEY = "target"; //$NON-NLS-1$
 

org.eclipse.m2e.launching/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.m2e.launching;singleton:=true
-Bundle-Version: 2.0.602.qualifier
+Bundle-Version: 2.0.603.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)",
  org.eclipse.core.variables,