Skip to content

Merge Conflict Resolution (from 8.2.x to 8.3.x) #978

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

Open
semaphore-agent-reader wants to merge 26 commits into
base: 8.3.x
Choose a base branch
from
Open

Merge Conflict Resolution (from 8.2.x to 8.3.x) #978

Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
93f8167
add log4j2 version definition and update version in log4j2-extensions
janjwerner-confluent Apr 24, 2026
a3b037e
Bump snappy-java to 1.1.10.8
nlou9 Apr 28, 2026
feef7ef
Update bouncycastle to 1.84
janjwerner-confluent Apr 29, 2026
0d136c8
Merge pull request #960 from confluentinc/add_log4j2_definition_74x
janjwerner-confluent Apr 29, 2026
7ed656b
Merge branch '7.4.x' into 7.5.x by janjwerner-confluent
semaphore-agent-production[bot] Apr 29, 2026
2ed77af
Merge branch '7.5.x' into 7.6.x by janjwerner-confluent
semaphore-agent-production[bot] Apr 29, 2026
509e27c
Merge branch '7.6.x' into 7.7.x by janjwerner-confluent
semaphore-agent-production[bot] Apr 29, 2026
69488e4
Merge branch '7.7.x' into 7.8.x by janjwerner-confluent
semaphore-agent-production[bot] Apr 29, 2026
84b3969
Merge branch '7.8.x' into 7.9.x by janjwerner-confluent
semaphore-agent-production[bot] Apr 29, 2026
f727b83
Merge branch '7.9.x' into 8.0.x by janjwerner-confluent
semaphore-agent-production[bot] Apr 29, 2026
db71459
Merge branch '8.0.x' into 8.1.x by janjwerner-confluent
semaphore-agent-production[bot] Apr 29, 2026
ecf4c85
Merge branch '8.1.x' into 8.2.x by janjwerner-confluent
semaphore-agent-production[bot] Apr 29, 2026
1fc1513
Merge pull request #975 from confluentinc/update_bouncycastle_1_8_4
janjwerner-confluent Apr 29, 2026
76efb50
Merge branch '7.4.x' into 7.5.x by janjwerner-confluent
semaphore-agent-production[bot] Apr 29, 2026
ed1ba1c
Merge branch '7.5.x' into 7.6.x by janjwerner-confluent
semaphore-agent-production[bot] Apr 29, 2026
c94a564
Merge branch '7.6.x' into 7.7.x by janjwerner-confluent
semaphore-agent-production[bot] Apr 29, 2026
0cf949a
Merge branch '7.7.x' into 7.8.x by janjwerner-confluent
semaphore-agent-production[bot] Apr 29, 2026
587fa1d
Merge branch '7.8.x' into 7.9.x by janjwerner-confluent
semaphore-agent-production[bot] Apr 29, 2026
a9d0631
Merge branch '8.0.x' into pr_merge_from_7_9_x_to_8_0_x
janjwerner-confluent Apr 29, 2026
2725ebb
Merge pull request #976 from confluentinc/pr_merge_from_7_9_x_to_8_0_x
janjwerner-confluent Apr 29, 2026
d3cfe62
Merge branch '8.0.x' into 8.1.x by janjwerner-confluent
semaphore-agent-production[bot] Apr 29, 2026
cb7a167
Merge branch '8.1.x' into 8.2.x by janjwerner-confluent
semaphore-agent-production[bot] Apr 29, 2026
0dc077f
Merge pull request #971 from confluentinc/bump-snappy-80
nlou9 Apr 30, 2026
a0e9b6b
Merge branch '8.0.x' into 8.1.x
semaphore-agent-production[bot] Apr 30, 2026
533e05e
Merge branch '8.1.x' into 8.2.x
semaphore-agent-production[bot] Apr 30, 2026
4142248
Merge branch '8.2.x' into 8.3.x (resolve conflict)
nlou9 Apr 30, 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
2 changes: 1 addition & 1 deletion log4j2-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.25.4</version>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>io.confluent</groupId>
Expand Down