Skip to content

Commit 453a788

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
Bump deps and plugins.
Also, rename `errorprone.version` to `error_prone_annotatations.version`, as suggested by kluever in 3c0e704. The bump command: `for F in . guava-bom; do mvn org.codehaus.mojo:versions-maven-plugin:2.19.1:{update-properties,use-latest-releases} -DgenerateBackupPoms=false -Dmaven.version.ignore='(?i).*-(alpha|beta|m|rc)([-. ]?\d+)?' -Dexcludes=org.mockito:mockito-core -f $F; done` Then I updated the version of `error_prone_annotations` in `integration-tests/gradle/build.gradle.kts`. RELNOTES=n/a PiperOrigin-RevId: 812904832
1 parent a82bb6d commit 453a788

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

android/guava-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</issueManagement>
4646

4747
<properties>
48-
<central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
48+
<central-publishing-maven-plugin.version>0.9.0</central-publishing-maven-plugin.version>
4949
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
5050
</properties>
5151

android/pom.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@
5454
<surefire.toolchain.version>${java.specification.version}</surefire.toolchain.version>
5555
<!-- Override this with -Dtest.include="**/SomeTest.java" on the CLI -->
5656
<test.include>%regex[.*.class]</test.include>
57-
<animal-sniffer-maven-plugin.version>1.23</animal-sniffer-maven-plugin.version>
58-
<asm.version>9.6</asm.version>
59-
<build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
60-
<central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
57+
<animal-sniffer-maven-plugin.version>1.24</animal-sniffer-maven-plugin.version>
58+
<asm.version>9.8</asm.version>
59+
<build-helper-maven-plugin.version>3.6.1</build-helper-maven-plugin.version>
60+
<central-publishing-maven-plugin.version>0.9.0</central-publishing-maven-plugin.version>
61+
<error_prone_annotations.version>2.42.0</error_prone_annotations.version>
6162
<error_prone_core.version>2.36.0</error_prone_core.version>
62-
<errorprone.version>2.41.0</errorprone.version>
6363
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
6464
<failureaccess.version>1.0.3</failureaccess.version>
6565
<gummy-bears-api-23-version>0.12.0</gummy-bears-api-23-version>
@@ -72,18 +72,18 @@
7272
<jsr305.version>3.0.2</jsr305.version>
7373
<junit.version>4.13.2</junit.version>
7474
<listenablefuture.version>9999.0-empty-to-avoid-conflict-with-guava</listenablefuture.version>
75-
<maven-antrun-plugin.version>1.6</maven-antrun-plugin.version>
75+
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
7676
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
77-
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
78-
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
79-
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
77+
<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
78+
<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
79+
<maven-enforcer-plugin.version>3.6.1</maven-enforcer-plugin.version>
8080
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
81-
<maven-install-plugin.version>3.1.3</maven-install-plugin.version>
81+
<maven-install-plugin.version>3.1.4</maven-install-plugin.version>
8282
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
83-
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
83+
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
8484
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
8585
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
86-
<maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
86+
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
8787
<maven-toolchains-plugin.version>3.2.0</maven-toolchains-plugin.version>
8888
<plexus-io.version>3.5.1</plexus-io.version> <!-- We need at least 3.5.1 to avoid https://github.com/codehaus-plexus/plexus-io/issues/109. Once we upgrade maven-jar-plugin itself to a version new enough to depend on 3.5.1 or higher, we can remove this override. -->
8989
<toolchains-maven-plugin.version>4.5.0</toolchains-maven-plugin.version>
@@ -120,7 +120,7 @@
120120
<dependency>
121121
<groupId>com.google.errorprone</groupId>
122122
<artifactId>error_prone_annotations</artifactId>
123-
<version>${errorprone.version}</version>
123+
<version>${error_prone_annotations.version}</version>
124124
</dependency>
125125
<dependency>
126126
<groupId>com.google.j2objc</groupId>

guava-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</issueManagement>
4646

4747
<properties>
48-
<central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
48+
<central-publishing-maven-plugin.version>0.9.0</central-publishing-maven-plugin.version>
4949
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
5050
</properties>
5151

guava/module.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"group": "com.google.errorprone",
5252
"module": "error_prone_annotations",
5353
"version": {
54-
"requires": "${errorprone.version}"
54+
"requires": "${error_prone_annotations.version}"
5555
}
5656
},
5757
{
@@ -117,7 +117,7 @@
117117
"group": "com.google.errorprone",
118118
"module": "error_prone_annotations",
119119
"version": {
120-
"requires": "${errorprone.version}"
120+
"requires": "${error_prone_annotations.version}"
121121
}
122122
},
123123
{
@@ -183,7 +183,7 @@
183183
"group": "com.google.errorprone",
184184
"module": "error_prone_annotations",
185185
"version": {
186-
"requires": "${errorprone.version}"
186+
"requires": "${error_prone_annotations.version}"
187187
}
188188
},
189189
{
@@ -249,7 +249,7 @@
249249
"group": "com.google.errorprone",
250250
"module": "error_prone_annotations",
251251
"version": {
252-
"requires": "${errorprone.version}"
252+
"requires": "${error_prone_annotations.version}"
253253
}
254254
},
255255
{

integration-tests/gradle/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ val expectedReducedRuntimeClasspathAndroidVersion =
1010
"failureaccess-1.0.3.jar",
1111
"j2objc-annotations-3.1.jar",
1212
"jspecify-1.0.0.jar",
13-
"error_prone_annotations-2.41.0.jar",
13+
"error_prone_annotations-2.42.0.jar",
1414
"listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
1515
)
1616
val expectedReducedRuntimeClasspathJreVersion =
@@ -19,7 +19,7 @@ val expectedReducedRuntimeClasspathJreVersion =
1919
"failureaccess-1.0.3.jar",
2020
"j2objc-annotations-3.1.jar",
2121
"jspecify-1.0.0.jar",
22-
"error_prone_annotations-2.41.0.jar",
22+
"error_prone_annotations-2.42.0.jar",
2323
"listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
2424
)
2525
val expectedCompileClasspathAndroidVersion = expectedReducedRuntimeClasspathAndroidVersion

pom.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
<surefire.toolchain.version>${java.specification.version}</surefire.toolchain.version>
5656
<!-- Override this with -Dtest.include="**/SomeTest.java" on the CLI -->
5757
<test.include>%regex[.*.class]</test.include>
58-
<animal-sniffer-maven-plugin.version>1.23</animal-sniffer-maven-plugin.version>
59-
<asm.version>9.6</asm.version>
60-
<build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
61-
<central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
58+
<animal-sniffer-maven-plugin.version>1.24</animal-sniffer-maven-plugin.version>
59+
<asm.version>9.8</asm.version>
60+
<build-helper-maven-plugin.version>3.6.1</build-helper-maven-plugin.version>
61+
<central-publishing-maven-plugin.version>0.9.0</central-publishing-maven-plugin.version>
62+
<error_prone_annotations.version>2.42.0</error_prone_annotations.version>
6263
<error_prone_core.version>2.36.0</error_prone_core.version>
63-
<errorprone.version>2.41.0</errorprone.version>
6464
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
6565
<failureaccess.version>1.0.3</failureaccess.version>
6666
<gummy-bears-api-23-version>0.12.0</gummy-bears-api-23-version>
@@ -73,18 +73,18 @@
7373
<jsr305.version>3.0.2</jsr305.version>
7474
<junit.version>4.13.2</junit.version>
7575
<listenablefuture.version>9999.0-empty-to-avoid-conflict-with-guava</listenablefuture.version>
76-
<maven-antrun-plugin.version>1.6</maven-antrun-plugin.version>
76+
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
7777
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
78-
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
79-
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
80-
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
78+
<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
79+
<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
80+
<maven-enforcer-plugin.version>3.6.1</maven-enforcer-plugin.version>
8181
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
82-
<maven-install-plugin.version>3.1.3</maven-install-plugin.version>
82+
<maven-install-plugin.version>3.1.4</maven-install-plugin.version>
8383
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
84-
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
84+
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
8585
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
8686
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
87-
<maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
87+
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
8888
<maven-toolchains-plugin.version>3.2.0</maven-toolchains-plugin.version>
8989
<plexus-io.version>3.5.1</plexus-io.version> <!-- We need at least 3.5.1 to avoid https://github.com/codehaus-plexus/plexus-io/issues/109. Once we upgrade maven-jar-plugin itself to a version new enough to depend on 3.5.1 or higher, we can remove this override. -->
9090
<toolchains-maven-plugin.version>4.5.0</toolchains-maven-plugin.version>
@@ -121,7 +121,7 @@
121121
<dependency>
122122
<groupId>com.google.errorprone</groupId>
123123
<artifactId>error_prone_annotations</artifactId>
124-
<version>${errorprone.version}</version>
124+
<version>${error_prone_annotations.version}</version>
125125
</dependency>
126126
<dependency>
127127
<groupId>com.google.j2objc</groupId>

0 commit comments

Comments
 (0)