Skip to content

Commit

Permalink
merge: #611 #612
Browse files Browse the repository at this point in the history
611: build(deps): Bump protobuf-java from 3.21.11 to 3.21.12 r=korthout a=dependabot[bot]

Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.21.11 to 3.21.12.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c"><code>f0dc78d</code></a> Updating version.json and repo version numbers to: 21.12</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/7b0ca6995da9c895ac1ca0005b705fa01f009b7f"><code>7b0ca69</code></a> Updated release branch to latest upb. (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/11258">#11258</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/7c123c40e2725fa1d36b194040fc4e9f2fe8502c"><code>7c123c4</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/11201">#11201</a> from protocolbuffers/21.x-202212080033</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/44eafb2f651436fd583051f137556ffcf43bd1d9"><code>44eafb2</code></a> Update version.json to: 21.12-dev</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/ffe65a5040ac721596055f89a55712a8b0dd8d8d"><code>ffe65a5</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/11197">#11197</a> from protocolbuffers/21.x-202212071935</li>
<li>See full diff in <a href="https://github.com/protocolbuffers/protobuf/compare/v3.21.11...v3.21.12">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.21.11&new-version=3.21.12)](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` 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>

612: build(deps): Bump mockito-core from 4.9.0 to 4.10.0 r=korthout a=dependabot[bot]

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.9.0 to 4.10.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/mockito/mockito/releases">mockito-core's releases</a>.</em></p>
<blockquote>
<h2>v4.10.0</h2>
<p><!-- raw HTML omitted --><!-- raw HTML omitted --><em>Changelog generated by <a href="https://github.com/shipkit/shipkit-changelog">Shipkit Changelog Gradle Plugin</a></em><!-- raw HTML omitted --><!-- raw HTML omitted --></p>
<h4>4.10.0</h4>
<ul>
<li>2022-12-14 - <a href="https://github.com/mockito/mockito/compare/v4.9.0...v4.10.0">13 commit(s)</a> by Andrei Solntsev, Andriy Redko, Andy Coates, Christopher Lambert, Marcono1234, Vladimir Glinskikh, dependabot[bot]</li>
<li>Add new artifact mockito-subclass (to use mock-maker-subclass MockMaker) [(<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2821">#2821</a>)](<a href="https://github-redirect.dependabot.com/mockito/mockito/pull/2821">mockito/mockito#2821</a>)</li>
<li>Bump gradle from 7.5.1 to 7.6 [(<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2817">#2817</a>)](<a href="https://github-redirect.dependabot.com/mockito/mockito/pull/2817">mockito/mockito#2817</a>)</li>
<li>Fix incorrect Javadoc inline tag for MockitoJUnitRunner [(<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2816">#2816</a>)](<a href="https://github-redirect.dependabot.com/mockito/mockito/pull/2816">mockito/mockito#2816</a>)</li>
<li>Bump shipkit-auto-version from 1.2.1 to 1.2.2 [(<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2811">#2811</a>)](<a href="https://github-redirect.dependabot.com/mockito/mockito/pull/2811">mockito/mockito#2811</a>)</li>
<li>Bump com.github.ben-manes.versions from 0.42.0 to 0.44.0 [(<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2810">#2810</a>)](<a href="https://github-redirect.dependabot.com/mockito/mockito/pull/2810">mockito/mockito#2810</a>)</li>
<li>Bump kotlinVersion from 1.7.21 to 1.7.22 [(<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2809">#2809</a>)](<a href="https://github-redirect.dependabot.com/mockito/mockito/pull/2809">mockito/mockito#2809</a>)</li>
<li>Bump junit from 1.1.3 to 1.1.4 [(<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2806">#2806</a>)](<a href="https://github-redirect.dependabot.com/mockito/mockito/pull/2806">mockito/mockito#2806</a>)</li>
<li>Simplify <code>MatcherApplicationStrategy</code> [(<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2803">#2803</a>)](<a href="https://github-redirect.dependabot.com/mockito/mockito/pull/2803">mockito/mockito#2803</a>)</li>
<li>Bump kotlinVersion from 1.7.10 to 1.7.21 [(<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2801">#2801</a>)](<a href="https://github-redirect.dependabot.com/mockito/mockito/pull/2801">mockito/mockito#2801</a>)</li>
<li>Bump espresso-core from 3.4.0 to 3.5.0 [(<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2800">#2800</a>)](<a href="https://github-redirect.dependabot.com/mockito/mockito/pull/2800">mockito/mockito#2800</a>)</li>
<li>Bump versions.bytebuddy from 1.12.16 to 1.12.19 [(<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2799">#2799</a>)](<a href="https://github-redirect.dependabot.com/mockito/mockito/pull/2799">mockito/mockito#2799</a>)</li>
<li>Upgrade errorprone from 2.14.0 to 2.16 [(<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2794">#2794</a>)](<a href="https://github-redirect.dependabot.com/mockito/mockito/pull/2794">mockito/mockito#2794</a>)</li>
<li>automatically detect class to mock [(<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2779">#2779</a>)](<a href="https://github-redirect.dependabot.com/mockito/mockito/pull/2779">mockito/mockito#2779</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/mockito/mockito/commit/a4e2e48507424d7efc32be53f5bd23bcfd3b4ddb"><code>a4e2e48</code></a> Add <code>mockito-subclass</code> artifact (<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2821">#2821</a>)</li>
<li><a href="https://github.com/mockito/mockito/commit/e2e628918518b73de7381692f28556ac6caa4710"><code>e2e6289</code></a> Bump gradle from 7.5.1 to 7.6 (<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2817">#2817</a>)</li>
<li><a href="https://github.com/mockito/mockito/commit/ee9ba749fee1bf9c48429ce9083cd171709441e3"><code>ee9ba74</code></a> Fix incorrect Javadoc inline tag for MockitoJUnitRunner (<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2816">#2816</a>)</li>
<li><a href="https://github.com/mockito/mockito/commit/2567f050f1e48da5acad2c5d616e565650f64b9d"><code>2567f05</code></a> Bump shipkit-auto-version from 1.2.1 to 1.2.2 (<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2811">#2811</a>)</li>
<li><a href="https://github.com/mockito/mockito/commit/bdcb31e34c301a45845cfc743438c7aeaeb8b096"><code>bdcb31e</code></a> Bump com.github.ben-manes.versions from 0.42.0 to 0.44.0 (<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2810">#2810</a>)</li>
<li><a href="https://github.com/mockito/mockito/commit/34b8a8db64798538d66d88fd7fc572990ca0c908"><code>34b8a8d</code></a> Bump kotlinVersion from 1.7.21 to 1.7.22 (<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2809">#2809</a>)</li>
<li><a href="https://github.com/mockito/mockito/commit/83a41fdff122b0f82b8754571d3a9fa2d37dece6"><code>83a41fd</code></a> Bump junit from 1.1.3 to 1.1.4 (<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2806">#2806</a>)</li>
<li><a href="https://github.com/mockito/mockito/commit/8f4af189a9f98190c1ead3aff630e05cda721a89"><code>8f4af18</code></a> Simplify <code>MatcherApplicationStrategy</code> (<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2803">#2803</a>)</li>
<li><a href="https://github.com/mockito/mockito/commit/0ce902af967cca91cb9ff2beaac95e44406bd175"><code>0ce902a</code></a> Bump kotlinVersion from 1.7.10 to 1.7.21 (<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2801">#2801</a>)</li>
<li><a href="https://github.com/mockito/mockito/commit/a8af0426e5e09a6d5ba8786af185f71dc7591bfc"><code>a8af042</code></a> Bump espresso-core from 3.4.0 to 3.5.0 (<a href="https://github-redirect.dependabot.com/mockito/mockito/issues/2800">#2800</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/mockito/mockito/compare/v4.9.0...v4.10.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.mockito:mockito-core&package-manager=maven&previous-version=4.9.0&new-version=4.10.0)](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` 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>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
zeebe-bors-camunda[bot] and dependabot[bot] authored Dec 22, 2022
3 parents 015f92e + 120faaf + cfcb3b3 commit 7e3b0fc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@
<dependency.jna.version>5.12.1</dependency.jna.version>
<dependency.junit.version>5.9.1</dependency.junit.version>
<dependency.junit4.version>4.13.2</dependency.junit4.version>
<dependency.mockito.version>4.9.0</dependency.mockito.version>
<dependency.mockito.version>4.10.0</dependency.mockito.version>
<dependency.netty.version>4.1.86.Final</dependency.netty.version>
<dependency.osgi.version>6.0.0</dependency.osgi.version>
<dependency.proto.version>2.11.0</dependency.proto.version>
<dependency.protobuf.version>3.21.11</dependency.protobuf.version>
<dependency.protobuf.version>3.21.12</dependency.protobuf.version>
<dependency.revapi.version>0.28.0</dependency.revapi.version>
<dependency.scala.version>2.13.10</dependency.scala.version>
<dependency.slf4j.version>2.0.6</dependency.slf4j.version>
Expand Down

0 comments on commit 7e3b0fc

Please sign in to comment.