Merge branch 'eclipse-tests-signature'

Rawi01 · Oct 17, 2024 · 022ea9f · 022ea9f
2 parents 43d96ab + 0bc7f19
commit 022ea9f
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 4 deletions.
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
@@ -108,13 +108,15 @@ jobs:
  - eclipse-202312
  - eclipse-202403
  - eclipse-202406
+ - eclipse-202409
  - eclipse-I-build
  - eclipse-oxygen-full
  - eclipse-2022-03-full
  - eclipse-2023-09-full
  - eclipse-2023-12-full
  - eclipse-2024-03-full
  - eclipse-2024-06-full
+ - eclipse-2024-09-full
  - eclipse-I-build-full
  - ecj11
  - ecj14

diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
@@ -35,6 +35,7 @@
  <conf name="eclipse-202312" />
  <conf name="eclipse-202403" />
  <conf name="eclipse-202406" />
+ <conf name="eclipse-202409" />
 
  <conf name="mapstruct" />
  </configurations>
@@ -148,7 +149,7 @@
  <dependency org="org.eclipse.platform" name="org.eclipse.core.jobs" rev="3.15.100" conf="eclipse-202312->default" transitive="false" />
  <dependency org="org.eclipse.platform" name="org.eclipse.osgi" rev="3.18.600" conf="eclipse-202312->default" transitive="false" />
  <dependency org="org.eclipse.platform" name="org.eclipse.text" rev="3.13.100" conf="eclipse-202312->default" transitive="false" />
-  
+
  <dependency org="org.eclipse.platform" name="org.eclipse.core.runtime" rev="3.31.0" conf="eclipse-202403->default" transitive="false" />
  <dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core" rev="3.37.0" conf="eclipse-202403->default" transitive="false" />
  <dependency org="org.eclipse.jdt" name="org.eclipse.jdt.ui" rev="3.32.0" conf="eclipse-202403->default" transitive="false" />
@@ -161,7 +162,7 @@
  <dependency org="org.eclipse.platform" name="org.eclipse.core.jobs" rev="3.15.200" conf="eclipse-202403->default" transitive="false" />
  <dependency org="org.eclipse.platform" name="org.eclipse.osgi" rev="3.19.0" conf="eclipse-202403->default" transitive="false" />
  <dependency org="org.eclipse.platform" name="org.eclipse.text" rev="3.14.0" conf="eclipse-202403->default" transitive="false" />
-  
+
  <dependency org="org.eclipse.platform" name="org.eclipse.core.runtime" rev="3.31.100" conf="eclipse-202406->default" transitive="false" />
  <dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core" rev="3.38.0" conf="eclipse-202406->default" transitive="false" />
  <dependency org="org.eclipse.jdt" name="org.eclipse.jdt.ui" rev="3.32.100" conf="eclipse-202406->default" transitive="false" />
@@ -175,6 +176,19 @@
  <dependency org="org.eclipse.platform" name="org.eclipse.osgi" rev="3.20.0" conf="eclipse-202406->default" transitive="false" />
  <dependency org="org.eclipse.platform" name="org.eclipse.text" rev="3.14.100" conf="eclipse-202406->default" transitive="false" />
 
+ <dependency org="org.eclipse.platform" name="org.eclipse.core.runtime" rev="3.31.100" conf="eclipse-202409->default" transitive="false" />
+ <dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core" rev="3.39.0" conf="eclipse-202409->default" transitive="false" />
+ <dependency org="org.eclipse.jdt" name="org.eclipse.jdt.ui" rev="3.33.0" conf="eclipse-202409->default" transitive="false" />
+ <dependency org="org.eclipse.jdt" name="ecj" rev="3.39.0" conf="eclipse-202409->default" transitive="false" />
+ <dependency org="org.eclipse.platform" name="org.eclipse.equinox.common" rev="3.19.100" conf="eclipse-202409->default" transitive="false" />
+ <dependency org="org.eclipse.platform" name="org.eclipse.equinox.registry" rev="3.12.100" conf="eclipse-202409->default" transitive="false" />
+ <dependency org="org.eclipse.platform" name="org.eclipse.equinox.app" rev="1.7.200" conf="eclipse-202409->default" transitive="false" />
+ <dependency org="org.eclipse.platform" name="org.eclipse.core.resources" rev="3.21.0" conf="eclipse-202409->default" transitive="false" />
+ <dependency org="org.eclipse.platform" name="org.eclipse.core.contenttype" rev="3.9.500" conf="eclipse-202409->default" transitive="false" />
+ <dependency org="org.eclipse.platform" name="org.eclipse.core.jobs" rev="3.15.400" conf="eclipse-202409->default" transitive="false" />
+ <dependency org="org.eclipse.platform" name="org.eclipse.osgi" rev="3.21.0" conf="eclipse-202409->default" transitive="false" />
+ <dependency org="org.eclipse.platform" name="org.eclipse.text" rev="3.14.100" conf="eclipse-202409->default" transitive="false" />
+
  <!-- integration with other libraries -->
  <dependency org="org.mapstruct" name="mapstruct-processor" rev="1.3.1.Final" conf="mapstruct->default" transitive="false" />
  </dependencies>

diff --git a/buildScripts/setup.ant.xml b/buildScripts/setup.ant.xml
@@ -180,6 +180,10 @@ This buildfile is part of projectlombok.org. It sets up the build itself.
  <fetchdep.eclipse.osgi name="2024-06" version="4.32" />
  </target>
 
+ <target name="deps.eclipse.2024-09" depends="deps.rtstubs18, compile.support">
+ <fetchdep.eclipse.osgi name="2024-09" version="4.33" />
+ </target>
+
  <target name="deps.eclipse.integration" depends="deps.rtstubs18, compile.support">
  <fetchdep.eclipse.osgi name="I-build" version="I-builds" />
  </target>

diff --git a/buildScripts/tests.ant.xml b/buildScripts/tests.ant.xml
@@ -233,6 +233,11 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn
  <test.eclipse-X version="202406" />
  </target>
 
+ <target name="test.eclipse-202409" depends="test.compile, test.formatter.compile" description="runs the tests on your default VM, testing the 2024-09 release of eclipse">
+ <fetchdep.eclipse version="202409" />
+ <test.eclipse-X version="202409" />
+ </target>
+
  <target name="test.eclipse-I-build" depends="test.compile, test.formatter.compile, deps.rtstubs18, compile.support" description="runs the tests on your default VM, testing the latest integration build of eclipse">
  <fetchdep.eclipse.updatesite name="I-build" version="I-builds" target="lib/" resolveDependencies="false">
  <bundles>
@@ -313,6 +318,10 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn
  <test.eclipse-X-full version="2024-06" />
  </target>
 
+ <target name="test.eclipse-2024-09-full" depends="test.eclipse.compile, test.formatter.compile, deps.eclipse.2024-09" description="runs the full eclipse tests on your default VM, testing the 2024-09 release of eclipse">
+ <test.eclipse-X-full version="2024-09" />
+ </target>
+
  <target name="test.eclipse-I-build-full" depends="test.eclipse.compile, test.formatter.compile, deps.eclipse.integration" description="runs the full eclipse tests on your default VM, testing the latest integration build of eclipse">
  <test.eclipse-X-full version="I-build" />
  </target>

diff --git a/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java b/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java
@@ -36,6 +36,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
 
 /**
  * Download eclipse bundles.
@@ -87,12 +90,14 @@ private static void downloadFile(String filename, String repositoryUrl, String t
  return;
  }
  System.out.print("Downloading '" + filename + "'... ");
+
  InputStream in = null;
  OutputStream out = null;
  try {
  in = getStreamForUrl(repositoryUrl + filename);
  out = new FileOutputStream(targetFile);
- copy(in, out);
+
+ copyZipButStripSignatures(in, out);
  System.out.println("[done]");
  } catch (IOException e) {
  System.out.println("[error]");
@@ -105,6 +110,18 @@ private static void downloadFile(String filename, String repositoryUrl, String t
  }
  }
 
+ private static void copyZipButStripSignatures(InputStream rawIn, OutputStream rawOut) throws IOException {
+ ZipInputStream in = new ZipInputStream(rawIn);
+ ZipOutputStream out = new ZipOutputStream(rawOut);
+
+ ZipEntry zipEntry;
+ while ((zipEntry = in.getNextEntry()) != null) {
+ if (zipEntry.getName().matches("META-INF/.*\\.(SF|RSA)")) continue;
+ out.putNextEntry(zipEntry);
+ copy(in, out);
+ }
+ }
+
  private static void copy(InputStream from, OutputStream to) throws IOException {
  byte[] b = new byte[4096];
  while (true) {

diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java
@@ -79,7 +79,6 @@ protected CompilerOptions ecjCompilerOptions(TestParameters parameters) {
  options.targetJDK = ecjCompilerVersionConstant;
  options.docCommentSupport = false;
  options.parseLiteralExpressionsAsConstants = true;
- options.inlineJsrBytecode = true;
  options.reportUnusedDeclaredThrownExceptionExemptExceptionAndThrowable = false;
  options.reportUnusedDeclaredThrownExceptionIncludeDocCommentReference = false;
  options.reportUnusedDeclaredThrownExceptionWhenOverriding = false;
@@ -96,6 +95,7 @@ protected CompilerOptions ecjCompilerOptions(TestParameters parameters) {
  warnings.put(CompilerOptions.OPTION_ReportNonStaticAccessToStatic, "warning");
  warnings.put("org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures", "ignore");
  warnings.put(CompilerOptions.OPTION_Source, (ecjCompilerVersion < 9 ? "1." : "") + ecjCompilerVersion);
+ warnings.put(CompilerOptions.OPTION_TargetPlatform, (ecjCompilerVersion < 9 ? "1." : "") + ecjCompilerVersion);
  warnings.put("org.eclipse.jdt.core.compiler.codegen.useStringConcatFactory", "disabled");
  options.set(warnings);
  return options;