From 49757f9e96ef6c2b570f6ba8ccee94d0485b2342 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Aug 2023 07:24:11 -0700
Subject: [PATCH] Bump com.google.protobuf:protobuf-java from 3.24.1 to 3.24.2

Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.24.1 to 3.24.2.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/54a2e5caa9d1a0a714fb2aa99753a1444414292a"><code>54a2e5c</code></a> Updating version.json and repo version numbers to: 24.2</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/7b825e1ca7e8624ff249451560c714382404d1a7"><code>7b825e1</code></a> Merge pull request <a href="https://redirect.github.com/protocolbuffers/protobuf/issues/13656">#13656</a> from protocolbuffers/backport-tdp-msvc-32</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/5626baf004c3bb39fd4b362434c3f4cc8cc170f0"><code>5626baf</code></a> Remove a flaky test with very high memory requirements.</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/31efbb9f0eb9c4d020713a20fa07b7471802ae57"><code>31efbb9</code></a> Merge pull request <a href="https://redirect.github.com/protocolbuffers/protobuf/issues/13655">#13655</a> from mkruskal-google/backport-tdp-msvc-32</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/01e1a5c28ae00cca0821a95e3c68447df4d1591c"><code>01e1a5c</code></a> Fixes for 32-bit MSVC.</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/a478e190268bd7e842def5cdf97ea008c092030d"><code>a478e19</code></a> Add windows 32-bit tests and re-enable 2022</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/57d122993f15c9cedf02a9e5d3051118b7b8046a"><code>57d1229</code></a> Merge pull request <a href="https://redirect.github.com/protocolbuffers/protobuf/issues/13603">#13603</a> from protocolbuffers/24.x-202308181942</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/4a6f9c301f0eb38ec447414c5bce1ab97452dabd"><code>4a6f9c3</code></a> Updating version.json to: 24.2-dev</li>
<li>See full diff in <a href="https://github.com/protocolbuffers/protobuf/compare/v3.24.1...v3.24.2">compare view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.protobuf:protobuf-java&package-manager=maven&previous-version=3.24.1&new-version=3.24.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

</details>

Fixes #1164

COPYBARA_INTEGRATE_REVIEW=https://github.com/google/truth/pull/1164 from google:dependabot/maven/com.google.protobuf-protobuf-java-3.24.2 23b36b9efe64ba79dd4ea9de7ec513b4cb4d7033
PiperOrigin-RevId: 560704175
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index af8cc5c19..db16e86a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     -->
     <guava.jre.version>32.1.2-jre</guava.jre.version>
     <gwt.version>2.10.0</gwt.version>
-    <protobuf.version>3.24.1</protobuf.version>
+    <protobuf.version>3.24.2</protobuf.version>
     <!-- Property for protobuf-lite protocArtifact, which isn't a "normal" Maven dep. -->
     <!-- TODO(cpovirk): Use protobuf.version instead. But that requires finding the new way to request the Lite runtime. -->
     <protobuf-lite.protoc.version>3.1.0</protobuf-lite.protoc.version>