From 18b08922537c16b0de1d503c82307d613aae0138 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 11:45:11 -0700
Subject: [PATCH] Bump the maven group with 11 updates (#2660)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Bump the maven group with 11 updates

Bumps the maven group with 11 updates:

| Package | From | To |
| --- | --- | --- |
| [com.google.errorprone:error_prone_core](https://github.com/google/error-prone) | `2.25.0` | `2.26.1` |
| [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) | `3.12.1` | `3.13.0` |
| [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) | `3.1.0` | `3.2.2` |
| [com.github.siom79.japicmp:japicmp-maven-plugin](https://github.com/siom79/japicmp) | `0.18.5` | `0.20.0` |
| [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) | `2.25.0` | `2.26.1` |
| [com.google.guava:guava-testlib](https://github.com/google/guava) | `33.0.0-jre` | `33.1.0-jre` |
| [org.moditect:moditect-maven-plugin](https://github.com/moditect/moditect) | `1.1.0` | `1.2.1.Final` |
| com.android.tools:r8 | `8.2.47` | `8.3.37` |
| [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) | `2.16.1` | `2.17.0` |
| [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) | `3.25.3` | `4.26.1` |
| [com.google.guava:guava](https://github.com/google/guava) | `33.0.0-jre` | `33.1.0-jre` |


Updates `com.google.errorprone:error_prone_core` from 2.25.0 to 2.26.1
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](https://github.com/google/error-prone/compare/v2.25.0...v2.26.1)

Updates `org.apache.maven.plugins:maven-compiler-plugin` from 3.12.1 to 3.13.0
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.12.1...maven-compiler-plugin-3.13.0)

Updates `org.apache.maven.plugins:maven-gpg-plugin` from 3.1.0 to 3.2.2
- [Release notes](https://github.com/apache/maven-gpg-plugin/releases)
- [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.1.0...maven-gpg-plugin-3.2.2)

Updates `com.github.siom79.japicmp:japicmp-maven-plugin` from 0.18.5 to 0.20.0
- [Release notes](https://github.com/siom79/japicmp/releases)
- [Changelog](https://github.com/siom79/japicmp/blob/master/release.py)
- [Commits](https://github.com/siom79/japicmp/compare/japicmp-base-0.18.5...japicmp-base-0.20.0)

Updates `com.google.errorprone:error_prone_annotations` from 2.25.0 to 2.26.1
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](https://github.com/google/error-prone/compare/v2.25.0...v2.26.1)

Updates `com.google.guava:guava-testlib` from 33.0.0-jre to 33.1.0-jre
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Updates `org.moditect:moditect-maven-plugin` from 1.1.0 to 1.2.1.Final
- [Release notes](https://github.com/moditect/moditect/releases)
- [Commits](https://github.com/moditect/moditect/compare/1.1.0...1.2.1.Final)

Updates `com.android.tools:r8` from 8.2.47 to 8.3.37

Updates `com.fasterxml.jackson.core:jackson-databind` from 2.16.1 to 2.17.0
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `com.google.protobuf:protobuf-java` from 3.25.3 to 4.26.1
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](https://github.com/protocolbuffers/protobuf/commits)

Updates `com.google.guava:guava` from 33.0.0-jre to 33.1.0-jre
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.errorprone:error_prone_core
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: maven
- dependency-name: org.apache.maven.plugins:maven-compiler-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: maven
- dependency-name: org.apache.maven.plugins:maven-gpg-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: maven
- dependency-name: com.github.siom79.japicmp:japicmp-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: maven
- dependency-name: com.google.errorprone:error_prone_annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: maven
- dependency-name: com.google.guava:guava-testlib
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: maven
- dependency-name: org.moditect:moditect-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: maven
- dependency-name: com.android.tools:r8
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: maven
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: maven
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: maven
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: maven
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix a Jackson deprecation warning.

* Update to proto 4.26.1. (#2662)

Use `GeneratedMessage` rather than `GeneratedMessageV3` in proto tests.
[Proto v26.0] made a number of incompatible API changes, including
changing the base class for generated proto message code.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Éamonn McManus <emcmanus@google.com>
---
 gson/pom.xml                                              | 6 +++---
 metrics/pom.xml                                           | 2 +-
 .../main/java/com/google/gson/metrics/ParseBenchmark.java | 2 +-
 pom.xml                                                   | 8 ++++----
 proto/pom.xml                                             | 2 +-
 shrinker-test/pom.xml                                     | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gson/pom.xml b/gson/pom.xml
index 46876d31b6..5c20ebf6b2 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>
-      <version>2.25.0</version>
+      <version>2.26.1</version>
     </dependency>
 
     <dependency>
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava-testlib</artifactId>
-      <version>33.0.0-jre</version>
+      <version>33.1.0-jre</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -263,7 +263,7 @@
       <plugin>
         <groupId>org.moditect</groupId>
         <artifactId>moditect-maven-plugin</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.1.Final</version>
         <executions>
           <execution>
             <id>add-module-info</id>
diff --git a/metrics/pom.xml b/metrics/pom.xml
index a31e6a5116..63fe091cf0 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.16.1</version>
+      <version>2.17.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.caliper</groupId>
diff --git a/metrics/src/main/java/com/google/gson/metrics/ParseBenchmark.java b/metrics/src/main/java/com/google/gson/metrics/ParseBenchmark.java
index 4151b2abb5..601086c3c9 100644
--- a/metrics/src/main/java/com/google/gson/metrics/ParseBenchmark.java
+++ b/metrics/src/main/java/com/google/gson/metrics/ParseBenchmark.java
@@ -247,7 +247,7 @@ public void parse(char[] data, Document document) throws Exception {
             depth--;
             break;
           case FIELD_NAME:
-            jp.getCurrentName();
+            jp.currentName();
             break;
           case VALUE_STRING:
             jp.getText();
diff --git a/pom.xml b/pom.xml
index f915fe0067..1a3dc4cb96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,7 +213,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.12.1</version>
+          <version>3.13.0</version>
           <configuration>
             <showWarnings>true</showWarnings>
             <showDeprecation>true</showDeprecation>
@@ -293,7 +293,7 @@
               <path>
                 <groupId>com.google.errorprone</groupId>
                 <artifactId>error_prone_core</artifactId>
-                <version>2.25.0</version>
+                <version>2.26.1</version>
               </path>
             </annotationProcessorPaths>
           </configuration>
@@ -349,7 +349,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-gpg-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.2.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -442,7 +442,7 @@
         <plugin>
           <groupId>com.github.siom79.japicmp</groupId>
           <artifactId>japicmp-maven-plugin</artifactId>
-          <version>0.18.5</version>
+          <version>0.20.0</version>
           <configuration>
             <oldVersion>
               <dependency>
diff --git a/proto/pom.xml b/proto/pom.xml
index 253992b7b1..ee05445ac0 100644
--- a/proto/pom.xml
+++ b/proto/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>33.0.0-jre</version>
+      <version>33.1.0-jre</version>
     </dependency>
 
     <dependency>
diff --git a/shrinker-test/pom.xml b/shrinker-test/pom.xml
index dd76a4331b..4bc5233526 100644
--- a/shrinker-test/pom.xml
+++ b/shrinker-test/pom.xml
@@ -218,7 +218,7 @@
               but it appears that can be ignored -->
             <groupId>com.android.tools</groupId>
             <artifactId>r8</artifactId>
-            <version>8.2.47</version>
+            <version>8.3.37</version>
           </dependency>
         </dependencies>
       </plugin>