Merge branch 'master' into fix/resolve_deferred_vars_for_unit_tests_c…

…onfig

.github/workflows/licensecheck.yml

@@ -21,6 +21,7 @@ jobs:
     uses: eclipse-dash/dash-licenses/.github/workflows/mavenLicenseCheck.yml@master
     with:
       projectId: technology.m2e
+      javaVersion: 21
       setupScript: 'cd org.eclipse.m2e.maven.runtime && mvn generate-resources'
     secrets:
       gitlabAPIToken: ${{ secrets.M2E_GITLAB_API_TOKEN }}

.github/workflows/maven.yml

@@ -20,11 +20,11 @@ jobs:
     timeout-minutes: 45
 
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       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,9 +33,9 @@ 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
+      uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
       with:
         path: ~/.m2/repository
         # re-cache on changes in the pom and target files
@@ -46,12 +46,12 @@ jobs:
       uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1
       with:
        run: >-
-           mvn clean verify --batch-mode -Pits
+           mvn clean verify --batch-mode --threads 1C -Pits
            -Dtycho.p2.baselineMode=failCommon
-           -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true
+           -Dmaven.test.failure.ignore=true
            -Dtycho.surefire.deleteWorkDir=true
     - name: Upload Test Results
-      uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
       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@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
       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

@@ -1,52 +1,37 @@
 pipeline {
 	options {
 		timeout(time: 45, unit: 'MINUTES')
-		buildDiscarder(logRotator(numToKeepStr:'10'))
+		buildDiscarder(logRotator(numToKeepStr:'5', artifactNumToKeepStr: 'master'.equals(env.BRANCH_NAME) ? '5' : '1' ))
 		disableConcurrentBuilds(abortPrevious: true)
 		timestamps()
 	}
 	agent {
-		label "centos-latest"
+		label 'ubuntu-latest'
 	}
 	tools {
-		maven 'apache-maven-3.9.6'
-		jdk 'openjdk-jdk21-latest'
+		maven 'apache-maven-3.9.9'
+		jdk 'temurin-jdk21-latest'
 	}
 	stages {
 		stage('get m2e-core-tests') {
 			steps {
 				sh 'git submodule update --init --recursive --remote'
 			}
 		}
-		stage('initialize PGP') {
-			when {
-				anyOf{
-					branch 'master';
-					branch pattern: 'm2e-[0-9]+\\.[0-9]+\\.x', comparator: "REGEXP"
-				}
-			}
-			steps {
-				withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) {
-					sh 'gpg --batch --import "${KEYRING}"'
-					sh '''
-						for fpr in $(gpg --list-keys --with-colons | awk -F: \'/fpr:/ {print $10}\' | sort -u)
-						do
-							echo -e "5\ny\n" | gpg --batch --command-fd 0 --expert --edit-key ${fpr} trust
-						done
-					'''
-				}
-			}
-		}
 		stage('Build') {
 			steps {
-				withCredentials([string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE')]) {
+				withCredentials([
+					file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING'),
+					string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE')
+				]) {
 				xvnc(useXauthority: true) {
-					sh '''
-						mavenArgs="clean verify --batch-mode -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true -Dtycho.p2.baselineMode=failCommon"
+					sh '''#!/bin/bash -x
+						mavenArgs="clean verify --batch-mode -Dmaven.test.failure.ignore=true -Dtycho.p2.baselineMode=failCommon"
 						if [[ ${BRANCH_NAME} == master ]] || [[ ${BRANCH_NAME} =~ m2e-[0-9]+\\.[0-9]+\\.x ]]; then
-							mvn ${mavenArgs} -Peclipse-sign,its -Dgpg.passphrase="${KEYRING_PASSPHRASE}" -Dgpg.keyname="011C526F29B2CE79"
+							mvn ${mavenArgs} -Peclipse-sign,its -Dtycho.pgp.signer.bc.secretKeys="${KEYRING}" -Dgpg.passphrase="${KEYRING_PASSPHRASE}"
 						else
-							# Clear KEYRING_PASSPHRASE environment variable
+							# Clear signing environment variables for PRs
+							export KEYRING='EMPTY'
 							export KEYRING_PASSPHRASE='EMPTY'
 							mvn ${mavenArgs} -Pits
 						fi
@@ -59,7 +44,6 @@ pipeline {
 						*/target/work/data/.metadata/.log,\
 						m2e-core-tests/*/target/work/data/.metadata/.log,\
 						**/target/artifactcomparison/*'
-					archiveArtifacts (artifacts: '**/target/products/*.zip,**/target/products/*.tar.gz', onlyIfSuccessful: true)
 					junit '*/target/surefire-reports/TEST-*.xml,*/*/target/surefire-reports/TEST-*.xml'
 				}
 			}
@@ -69,8 +53,8 @@ pipeline {
 				branch 'master'
 			}
 			steps {
-				sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
-					sh '''
+				sshagent(['projects-storage.eclipse.org-bot-ssh']) {
+					sh '''#!/bin/bash -x
 						deployM2ERepository()
 						{
 							echo Deploy m2e repo to ${1}

m2e-parent/pom.xml

@@ -199,15 +199,6 @@
 						</dependency>
 					</dependencies>
 				</plugin>
-				<plugin>
-					<groupId>org.eclipse.cbi.maven.plugins</groupId>
-					<artifactId>eclipse-jarsigner-plugin</artifactId>
-					<version>1.5.0</version>
-					<configuration>
-						<excludeInnerJars>true</excludeInnerJars>
-						<resigningStrategy>DO_NOT_RESIGN</resigningStrategy>
-					</configuration>
-				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
@@ -220,25 +211,6 @@
 	</pluginRepositories>
 
 	<profiles>
-		<profile>
-			<id>eclipse-sign</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.cbi.maven.plugins</groupId>
-						<artifactId>eclipse-jarsigner-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>sign</id>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 		<profile>
 			<id>windows</id>
 			<activation>

org.eclipse.m2e.apt.core/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

org.eclipse.m2e.apt.core/.settings/org.eclipse.jdt.core.prefs

@@ -23,9 +23,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -130,7 +130,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX

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.3.0.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)",
  org.eclipse.core.resources,
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)",
  org.eclipse.m2e.jdt;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)"
 Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.m2e.apt;x-friends:="org.eclipse.m2e.apt.ui",
  org.eclipse.m2e.apt.preferences

org.eclipse.m2e.apt.tests/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

org.eclipse.m2e.apt.tests/.settings/org.eclipse.jdt.core.prefs

@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -100,4 +100,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21

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

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: m2e-apt Tests Plug-in
 Bundle-SymbolicName: org.eclipse.m2e.apt.tests
 Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.m2e.tests.common,
  org.junit,
  org.eclipse.jdt.core,

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>