Merge remote-tracking branch 'origin/master' into BETA_JAVA26

ensure plugin versions are master + 0.0.50 except j.core which has a
minor update wrt master.

Author: stephan-herrmann

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Upload
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
       with:
         name: Event File
         path: ${{ github.event_path }}
@@ -41,14 +41,14 @@ jobs:
     - name: Set up Maven
       uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
       with:
-        maven-version: 3.9.11
+        maven-version: 3.9.12
     - name: Build with Maven 🏗️
       run: |
         mvn clean install --batch-mode -f org.eclipse.jdt.core.compiler.batch -DlocalEcjVersion=99.99
         mvn -U clean verify --batch-mode --fail-at-end -Ptest-on-javase-21 -Pbree-libs -Papi-check -Djava.io.tmpdir=$WORKSPACE/tmp -Dproject.build.sourceEncoding=UTF-8 -Dtycho.surefire.argLine="--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,20 -Djdt.performance.asserts=disabled" -Dcbi-ecj-version=99.99
     - name: Upload Test Results for Linux
       if: always()
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
       with:
         name: test-results-linux
         if-no-files-found: warn

.mvn/extensions.xml

@@ -3,6 +3,6 @@
 	<extension>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-build</artifactId>
-		<version>4.0.10</version>
+		<version>5.0.1</version>
 	</extension>
 </extensions>

org.eclipse.jdt.apt.pluggable.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.apt.pluggable.core;singleton:=true
-Bundle-Version: 1.4.600.qualifier
+Bundle-Version: 1.4.700.qualifier
 Bundle-Activator: org.eclipse.jdt.internal.apt.pluggable.core.Apt6Plugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,

org.eclipse.jdt.apt.pluggable.core/src/org/eclipse/jdt/internal/apt/pluggable/core/dispatch/IdeProcessingEnvImpl.java

@@ -102,7 +102,7 @@ public Map<String, String> getOptions() {
 
 	private Function<Entry<String, String>, String> replacePlaceholdersUsing(Map<String, String> commandLineOptions) {
 		return option -> {
-			String variable, replacement, optionValue = option.getValue();
+			String variable, replacement, optionValue = option.getValue() == null ? "" : option.getValue();
 			Matcher placeholder = Pattern.compile("%([^%]+)%").matcher(optionValue);
 			if (placeholder.find() && (variable = placeholder.group(1)) != null
 					&& (replacement = commandLineOptions.get(variable)) != null) {

org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.apt.pluggable.tests;singleton:=true
-Bundle-Version: 3.6.800.qualifier
+Bundle-Version: 3.6.900.qualifier
 Bundle-Activator: org.eclipse.jdt.apt.pluggable.tests.Apt6TestsPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.junit,

org.eclipse.jdt.apt.pluggable.tests/pom.xml

@@ -19,7 +19,7 @@
     <relativePath>../tests-pom/</relativePath>
   </parent>
   <artifactId>org.eclipse.jdt.apt.pluggable.tests</artifactId>
-  <version>3.6.800-SNAPSHOT</version>
+  <version>3.6.900-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
   	<testSuite>${project.artifactId}</testSuite>

org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/BuilderTests.java

@@ -415,6 +415,25 @@ public void testBug341298() throws Throwable {
 		fullBuild();
 		assertTrue("Processor should be able to compile with passed options", Bug341298Processor.success());
 	}
+	public void testGHIssue4640() throws Throwable {
+		ProcessorTestStatus.reset();
+		IJavaProject project = createJavaProject(_projectName);
+		IPath root = project.getProject().getFullPath().append("src");
+		env.addClass(root, "test341298", "Annotated",
+				"package test341298;\n" +
+				"@Annotation public class Annotated {}"
+		);
+		env.addClass(root, "test341298", "Annotation",
+				"package test341298;\n" +
+				"public @interface Annotation {}"
+		);
+		AptConfig.addProcessorOption(project, "classpath", "%classpath%");
+		AptConfig.addProcessorOption(project, "sourcepath", "%sourcepath%");
+		AptConfig.addProcessorOption(project, "phase", null);
+		AptConfig.setEnabled(project, true);
+		fullBuild();
+		assertTrue("Processor should be able to compile with passed options", Bug341298Processor.success());
+	}
 
 	public void testBug539663() throws Throwable {
 		if (!canRunJava9()) {

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.apt.tests; singleton:=true
-Bundle-Version: 3.6.900.qualifier
+Bundle-Version: 3.6.1000.qualifier
 Bundle-ClassPath: apt.jar,
  aptext.jar,
  .

org.eclipse.jdt.apt.tests/pom.xml

@@ -19,7 +19,7 @@
     <relativePath>../tests-pom/</relativePath>
   </parent>
   <artifactId>org.eclipse.jdt.apt.tests</artifactId>
-  <version>3.6.900-SNAPSHOT</version>
+  <version>3.6.1000-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <build>

org.eclipse.jdt.apt.tests/src-resources/question/AnnotationTest.java

@@ -28,14 +28,17 @@ public interface AnnotationTest{
     @Deprecated
     public int field1 = 1;
 
-    @RTVisibleAnno(anno=@SimpleAnnotation("field"), clazzes={})
+    @Deprecated
+	@RTVisibleAnno(anno=@SimpleAnnotation("field"), clazzes={})
      @RTInvisibleAnno("2")
      public int field2 = 2;
 
-    @RTInvisibleAnno("3")
+    @Deprecated
+	@RTInvisibleAnno("3")
     public int field3 = 3;
 
-    @SimpleAnnotation("4")
+    @Deprecated
+	@SimpleAnnotation("4")
     public int field4 = 4;
 
     @RTVisibleAnno(anno=@SimpleAnnotation("method0"), clazzes={})
@@ -46,26 +49,32 @@ public interface AnnotationTest{
     @Deprecated
      public int method1();
 
-    @RTVisibleAnno(anno=@SimpleAnnotation("method2"), clazzes={})
+    @Deprecated
+	@RTVisibleAnno(anno=@SimpleAnnotation("method2"), clazzes={})
      @RTInvisibleAnno("2")
     public int method2();
 
-   @RTInvisibleAnno("3")
+   @Deprecated
+@RTInvisibleAnno("3")
    public int method3();
 
-   @SimpleAnnotation("method4")
+   @Deprecated
+@SimpleAnnotation("method4")
    public int method4();
 
-   public int method5(int p0,
+   @Deprecated
+public int method5(int p0,
    				   @Deprecated
    				   int p1,
    				   @RTVisibleAnno(anno=@SimpleAnnotation("param2"), clazzes={})
    				   @RTInvisibleAnno("2")
    				   int p2);
 
-   public int method6(int p0, int p1, int p2);
+   @Deprecated
+public int method6(int p0, int p1, int p2);
 
-   @RTVisibleAnno(name = "I'm \"special\": \t\\\n",
+   @Deprecated
+@RTVisibleAnno(name = "I'm \"special\": \t\\\n",
 		          charValue = '\'',
 		          clazzes = {},
 		          anno = @SimpleAnnotation(""))