Skip to content

Merge Conflict Resolution (from 8.0.x to 8.1.x) #937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
semaphore-agent-production merged 4 commits into from
Mar 30, 2026
Merged

Merge Conflict Resolution (from 8.0.x to 8.1.x) #937

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cb23e8
[BOM] Bump classgraph, easymock, snappy-java on 8.0.x
nlou9 Mar 20, 2026
98d1966
Merge pull request #935 from confluentinc/bump-deps-8.0.x
nlou9 Mar 23, 2026
e85d7c7
[BOM] Bump commons-io, commons-compress, spotbugs on 8.0.x
nlou9 Mar 25, 2026
f12eca9
Merge pull request #938 from confluentinc/nllou/bump-deps-8.0.x-3
nlou9 Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
<!--jacoco prepare-agent needs argLine defined to set this variable. if we don't have a default set then maven gets angry.-->
<argLine></argLine>
<avro.version>1.12.1</avro.version>
<classgraph.version>4.8.138</classgraph.version>
<commons-io.version>2.16.0</commons-io.version>
<classgraph.version>4.8.179</classgraph.version>
<commons-io.version>2.20.0</commons-io.version>
<commons-codec.version>1.16.1</commons-codec.version>
<commons-compress.version>1.26.1</commons-compress.version>
<commons-compress.version>1.28.0</commons-compress.version>
<commons-validator.version>1.10.0</commons-validator.version>
<commons-beanutils.version>1.11.0</commons-beanutils.version>
<commons-lang3.version>3.18.0</commons-lang3.version>
Expand All @@ -63,12 +63,12 @@
<required.maven.version>3.2</required.maven.version>
<kafka.version>[8.0.4-0-ccs, 8.0.5-0-ccs)</kafka.version>
<ce.kafka.version>[8.0.4-0-ce, 8.0.5-0-ce)</ce.kafka.version>
<easymock.version>5.2.0</easymock.version>
<easymock.version>5.6.0</easymock.version>
<!-- keep exec-maven-plugin on 1.5.0 until https://github.com/mojohaus/exec-maven-plugin/issues/76 is fixed
running our LicenseFinder plugin in create-licenses-for-docker breaks when upgrading to 1.6.0 -->
<exec-maven-plugin.version>1.5.0</exec-maven-plugin.version>
<spotbugs.version>4.9.3</spotbugs.version>
<spotbugs.maven.plugin.version>4.9.3.0</spotbugs.maven.plugin.version>
<spotbugs.version>4.9.8</spotbugs.version>
<spotbugs.maven.plugin.version>4.9.8.0</spotbugs.maven.plugin.version>
<java.version>11</java.version>
<jackson.version>2.16.0</jackson.version>
<jakarta-websocket-api.version>2.2.0</jakarta-websocket-api.version>
Expand Down Expand Up @@ -112,7 +112,7 @@
<slf4j-reload4j.version>1.7.36</slf4j-reload4j.version>
<logback-core.version>1.5.27</logback-core.version>
<snakeyaml.version>2.0</snakeyaml.version>
<snappy.version>1.1.10.5</snappy.version>
<snappy.version>1.1.10.7</snappy.version>
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-reload4j/1.7.36 -->
<reload4j.version>1.2.25</reload4j.version>
<logredactor.version>1.0.17</logredactor.version>
Expand Down