Skip to content

Commit 087c082

Browse files
authored
Merge pull request DSpace#11914 from MMilosz/chore/errorprone-jdk17-pin-removal
Remove ErrorProne pin and bump to latest version for JDK 21
2 parents 510be7d + dfdd911 commit 087c082

2 files changed

Lines changed: 3 additions & 11 deletions

File tree

.github/dependabot.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,6 @@ updates:
135135
# Don't try to auto-update any DSpace dependencies
136136
- dependency-name: "org.dspace:*"
137137
- dependency-name: "org.dspace.*:*"
138-
# Last version of errorprone to support JDK 17 is 2.42.0
139-
# TODO: Remove this after this ticket is resolved https://github.com/DSpace/DSpace/issues/11621
140-
- dependency-name: "com.google.errorprone:*"
141-
versions: [ ">=2.43.0" ]
142138
# Don't automatically update BouncyCastle because maven-gpg-plugin REQUIRES a very specific version or release
143139
# errors will occur. See https://github.com/DSpace/DSpace/pull/11696
144140
- dependency-name: "org.bouncycastle:*"
@@ -277,9 +273,6 @@ updates:
277273
# Don't try to auto-update any DSpace dependencies
278274
- dependency-name: "org.dspace:*"
279275
- dependency-name: "org.dspace.*:*"
280-
# Last version of errorprone to support JDK 17 is 2.42.0
281-
- dependency-name: "com.google.errorprone:*"
282-
versions: [ ">=2.43.0" ]
283276
# Don't automatically update BouncyCastle because maven-gpg-plugin REQUIRES a very specific version or release
284277
# errors will occur. See https://github.com/DSpace/DSpace/pull/11696
285278
- dependency-name: "org.bouncycastle:*"
@@ -418,9 +411,6 @@ updates:
418411
# Don't try to auto-update any DSpace dependencies
419412
- dependency-name: "org.dspace:*"
420413
- dependency-name: "org.dspace.*:*"
421-
# Last version of errorprone to support JDK 17 is 2.42.0
422-
- dependency-name: "com.google.errorprone:*"
423-
versions: [ ">=2.43.0" ]
424414
# Don't automatically update BouncyCastle because maven-gpg-plugin REQUIRES a very specific version or release
425415
# errors will occur. See https://github.com/DSpace/DSpace/pull/11696
426416
- dependency-name: "org.bouncycastle:*"

pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<solr.client.version>8.11.4</solr.client.version>
3131

3232
<ehcache.version>3.11.1</ehcache.version>
33-
<errorprone.version>2.42.0</errorprone.version>
33+
<errorprone.version>2.47.0</errorprone.version>
3434
<!-- NOTE: when updating jackson.version, also sync jackson-annotations.version below -->
3535
<jackson.version>2.21.0</jackson.version>
3636
<jackson-annotations.version>2.21</jackson-annotations.version>
@@ -155,6 +155,8 @@
155155
<arg>-XDcompilePolicy=simple</arg>
156156
<arg>--should-stop=ifError=FLOW</arg>
157157
<arg>-Xplugin:ErrorProne</arg>
158+
<!-- Required by Error Prone on JDK 21+: enables javac fix for JDK-8225377 -->
159+
<arg>-XDaddTypeAnnotationsToSymbol=true</arg>
158160
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
159161
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
160162
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>

0 commit comments

Comments
 (0)