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

janrieke · Apr 6, 2024 · fac6967 · fac6967
2 parents 7ea9570 + 9dc7e7f
commit fac6967
Show file tree

Hide file tree

Showing 129 changed files with 3,325 additions and 777 deletions.
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
@@ -10,16 +10,16 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 11
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ivyCache
@@ -31,7 +31,7 @@ jobs:
       - name: Build with Ant
         run: ant -noinput dist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: lombok.jar
           path: dist/lombok.jar
@@ -40,9 +40,11 @@ jobs:
   test-javac:
     runs-on: ubuntu-latest
     needs: build
+    env:
+      EA_JDK: 22
     strategy: 
       matrix: 
-        jdk: [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21]
+        jdk: [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22]
         goal: [javacCurrent]
         include:
           - jdk: 11
@@ -53,32 +55,34 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK ${{ matrix.jdk }}
-        if: ${{ matrix.jdk != 21 }}
-        uses: actions/setup-java@v3
+        if: ${{ matrix.jdk < env.EA_JDK }}
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.jdk }}
           distribution: 'zulu'
 
-      - name: Set up JDK 21-ea
-        if: ${{ matrix.jdk == 21 }}
+      - name: Set up JDK ${{ matrix.jdk }} Early Access release
+        if: ${{ matrix.jdk >= env.EA_JDK }}
         uses: oracle-actions/setup-java@v1
         with:
           website: jdk.java.net
-          release: 21
+          release: ${{ matrix.jdk }}
           version: latest
 
       - name: Install Ant
+        env:
+          ANT_VERSION: 1.10.14
         run: |
-          wget https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.13-bin.zip
-          unzip apache-ant-1.10.13-bin.zip -d "${HOME}"
-          echo "ANT_HOME=${HOME}/apache-ant-1.10.13" >> $GITHUB_ENV
-          echo "${HOME}/apache-ant-1.10.13/bin" >> $GITHUB_PATH
+          wget https://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VERSION-bin.zip
+          unzip apache-ant-$ANT_VERSION-bin.zip -d "${HOME}"
+          echo "ANT_HOME=${HOME}/apache-ant-$ANT_VERSION" >> $GITHUB_ENV
+          echo "${HOME}/apache-ant-$ANT_VERSION/bin" >> $GITHUB_PATH
       
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ivyCache
@@ -101,9 +105,15 @@ jobs:
         - eclipse-202006-jdk8
         - eclipse-202212
         - eclipse-202309
+        - eclipse-202312
+        - eclipse-202403
+        - eclipse-I-build
         - eclipse-oxygen-full
         - eclipse-2022-03-full
         - eclipse-2023-09-full
+        - eclipse-2023-12-full
+        - eclipse-2024-03-full
+        - eclipse-I-build-full
         - ecj11
         - ecj14
         - ecj16
@@ -112,16 +122,16 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'zulu'
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ivyCache
@@ -132,15 +142,15 @@ jobs:
 
       - name: Cache base testenv
         if: ${{ !endsWith(matrix.version, 'full') }}
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             testenv
           key: base-testenv-${{ hashFiles('**/setup.ant.xml') }}
 
       - name: Cache full testenv
         if: ${{ endsWith(matrix.version, 'full') }}
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             testenv
@@ -154,21 +164,23 @@ jobs:
     needs: build
     strategy: 
       matrix: 
-        jdk: [8, 11, 17, 21]
+        jdk: [8, 11, 17, 21, 22]
         tool: 
           - {name: "maven",  cmd: "mvn compile"}
           - {name: "gradle", cmd: "gradle assemble"}
           - {name: "ant",    cmd: "ant dist"}
           - {name: "bazel",  cmd: "bazel build //:ProjectRunner"}
+        exclude:
+          - {tool: {name: "gradle", cmd: "gradle assemble"}, jdk: 22}
       fail-fast: false
     env:
       IMAGE_NAME: lombok-${{ matrix.tool.name }}-jdk${{ matrix.jdk }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: lombok.jar
 

diff --git a/AUTHORS b/AUTHORS
@@ -17,6 +17,7 @@ Denis Stepanov <[email protected]>
 Emil Lundberg <[email protected]>
 Enrique da Costa Cambio <[email protected]>
 Jacob Middag <[email protected]>
+James Yoo <[email protected]>
 Jan Matèrne <[email protected]>
 Jan Rieke <[email protected]>
 Jappe van der Hel <[email protected]>
@@ -26,6 +27,7 @@ Kevin Chirls <[email protected]>
 Liu DongMiao <[email protected]>
 Luan Nico <[email protected]>
 Maarten Mulders <[email protected]>
+Manu Sridharan <[email protected]>
 Mark Haynes <[email protected]>
 Mart Hagenaars <[email protected]>
 Martin O'Connor <[email protected]>
@@ -34,6 +36,7 @@ Mateusz Matela <[email protected]>
 Michael Dardis <[email protected]>
 Michael Ernst <[email protected]>
 Michiel Verheul <[email protected]>
+Ole Ludwig <[email protected]>
 Pascal Bihler <[email protected]>
 Peter Grant <[email protected]>
 Philipp Eichhorn <[email protected]>
@@ -42,6 +45,7 @@ Pim van der Loos <[email protected]>
 Rabea Gransberger <[email protected]>
 Raul Wißfeld <[email protected]>
 Reinier Zwitserloot <[email protected]>
+Rob Stryker <[email protected]>
 Robbert Jan Grootjans <[email protected]>
 Robert Wertman <[email protected]>
 Roel Spilker <[email protected]>

diff --git a/...org.projectlombok-lombok.patcher-0.46.xml → ...org.projectlombok-lombok.patcher-0.50.xml b/...org.projectlombok-lombok.patcher-0.46.xml → ...org.projectlombok-lombok.patcher-0.50.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-	<info organisation="org.projectlombok" module="lombok.patcher" revision="0.46" publication="20230111220000">
+	<info organisation="org.projectlombok" module="lombok.patcher" revision="0.50" publication="20240112010000">
 		<license name="MIT License" url="https://www.opensource.org/licenses/mit-license.php" />
 		<ivyauthor name="rzwitserloot" url="https://github.com/rzwitserloot" />
 		<ivyauthor name="rspilker" url="https://github.com/rspilker" />
@@ -9,6 +9,6 @@
 		<conf name="default" />
 	</configurations>
 	<publications>
-		<artifact conf="default" url="https://projectlombok.org/downloads/lombok.patcher-0.46.jar" />
+		<artifact conf="default" url="https://projectlombok.org/downloads/lombok.patcher-0.50.jar" />
 	</publications>
 </ivy-module>
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
@@ -32,12 +32,14 @@
 		<conf name="eclipse-202006" />
 		<conf name="eclipse-202212" />
 		<conf name="eclipse-202309" />
+		<conf name="eclipse-202312" />
+		<conf name="eclipse-202403" />
 
 		<conf name="mapstruct" />
 	</configurations>
 	<dependencies>
 
-		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.48" conf="build,stripe->default" />
+		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.50" conf="build,stripe->default" />
 		<dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="build,stripe->runtime" />
 		<dependency org="org.apache.ant" name="ant" rev="1.10.5" conf="build->default" />
 		<dependency org="org.apache.ant" name="ant-junit" rev="1.10.5" conf="build->default" />
@@ -64,6 +66,7 @@
 		<dependency org="org.freemarker" name="freemarker" rev="2.3.28" conf="buildtools->default" />
 		<dependency org="com.sparkjava" name="spark-core" rev="2.9.2" conf="buildtools->default" />
 		<dependency org="software.amazon.awssdk" name="s3" rev="2.19.29" conf="buildtools->default" />
+		<dependency org="com.sun.xml.bind" name="jaxb-impl" rev="2.3.9" conf="buildtools->default" />
 
 		<!-- javacs -->
 		<dependency org="net.java.openjdk.custom" name="javac6" rev="1.6.0.18" conf="javac6->runtime" />
@@ -74,7 +77,7 @@
 
 		<dependency org="org.eclipse.jdt" name="ecj" rev="3.32.0" conf="ecj19->master" />
 		<dependency org="org.eclipse.jdt" name="ecj" rev="3.25.0" conf="ecj16->master" />
-		<dependency org="org.eclipse.jdt" name="ecj" rev="3.22.0.v20200530-2032" conf="ecj14->master" />
+		<dependency org="org.eclipse.jdt" name="ecj" rev="3.22.0" conf="ecj14->master" />
 		<dependency org="org.eclipse.jdt" name="ecj" rev="3.16.0" conf="ecj11->master" />
 		<!-- until oct 2016, ecj was released under org 'org.eclipse.jdt.core.compiler', and the versioning followed eclipse's versions. -->
 		<!-- after that, it switched to group 'org.eclipse.jdt', and follows its own version. That means 3.16.0 is a later release than 4.6.1 on the old group! -->
@@ -132,6 +135,32 @@
 		<dependency org="org.eclipse.platform" name="org.eclipse.osgi" rev="3.18.500" conf="eclipse-202309->default" transitive="false" />
 		<dependency org="org.eclipse.platform" name="org.eclipse.text" rev="3.13.100" conf="eclipse-202309->default" transitive="false" />
 
+		<dependency org="org.eclipse.platform" name="org.eclipse.core.runtime" rev="3.30.0" conf="eclipse-202312->default" transitive="false" />
+		<dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core" rev="3.36.0" conf="eclipse-202312->default" transitive="false" />
+		<dependency org="org.eclipse.jdt" name="org.eclipse.jdt.ui" rev="3.31.0" conf="eclipse-202312->default" transitive="false" />
+		<dependency org="org.eclipse.jdt" name="ecj" rev="3.36.0" conf="eclipse-202312->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.equinox.common" rev="3.18.200" conf="eclipse-202312->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.equinox.registry" rev="3.11.400" conf="eclipse-202312->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.equinox.app" rev="1.6.400" conf="eclipse-202312->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.core.resources" rev="3.20.0" conf="eclipse-202312->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.core.contenttype" rev="3.9.200" conf="eclipse-202312->default" transitive="false" />
+		<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" />
+		<dependency org="org.eclipse.jdt" name="ecj" rev="3.37.0" conf="eclipse-202403->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.equinox.common" rev="3.19.0" conf="eclipse-202403->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.equinox.registry" rev="3.12.0" conf="eclipse-202403->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.equinox.app" rev="1.7.0" conf="eclipse-202403->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.core.resources" rev="3.20.100" conf="eclipse-202403->default" transitive="false" />
+		<dependency org="org.eclipse.platform" name="org.eclipse.core.contenttype" rev="3.9.300" conf="eclipse-202403->default" transitive="false" />
+		<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" />
+
 		<!-- integration with other libraries -->
 		<dependency org="org.mapstruct" name="mapstruct-processor" rev="1.3.1.Final" conf="mapstruct->default" transitive="false" />
 	</dependencies>