Skip to content

Commit 44c6252

Browse files
semaphore-agent-production[bot]pbadanijanjwerner-confluentVedarthConfluentvi-tayal
authored
Merge Conflict Resolution (from 8.1.x to 8.2.x) (#10942)
* Merge Conflict Resolution (from 7.9.x to 8.0.x) (#10922) * KSQL-14176 | CVE fix for jersey-client dependency. (#10915) * KSQL-14176 | CVE fix for jersey-client dependency. (#10916) * KSQL-14176 | CVE fix for jersey-client dependency. (#10915) (cherry picked from commit fae0533) * [KSQL-14184]Update Netty to resolve CVE-2025-67735 (#10920) * update netty * update netty to 4.1.130, update netty-tcnative * downgrade netty-tcnative --------- Co-authored-by: Parag Badani <pbadani@users.noreply.github.com> Co-authored-by: semaphore-agent-production[bot] <117926516+semaphore-agent-production[bot]@users.noreply.github.com> Co-authored-by: Jan Werner <105367074+janjwerner-confluent@users.noreply.github.com> Co-authored-by: Vedarth Sharma <vesharma@confluent.io> * [KSQL-13890] | Add deprecation tracking for external dependencies (#10918) * [KSQL-13890] | Add check for deprecated methods and configs * [KSQL-13890] | Fix pipeline * [KSQL-13890] | Fix pipeline * [KSQL-13890] | Fix the pipeline * [KSQL-13890] | Fix fetching issue in ci * [KSQL-13890] | Fix directory issue * [KSQL-13890] | Fix maven command * [KSQL-13890] | Use larger instance type * [KSQL-13890] | Use amd machine * [KSQL-13890] | Optimise compilation * [KSQL-14273] | Update jersey version (#10927) * Ksql 14255 - bump log4j version for CVE (#10928) * Request to fix CVE-2025-68161 by bumping log4j version * Request to fix CVE-2025-68161 by bumping jersey-client * Merge Conflict Resolution (from 8.0.x to 8.1.x) (#10940) * Merge Conflict Resolution (from 7.9.x to 8.0.x) (#10933) * KSQL-14176 | CVE fix for jersey-client dependency. (#10915) * KSQL-14176 | CVE fix for jersey-client dependency. (#10916) * KSQL-14176 | CVE fix for jersey-client dependency. (#10915) (cherry picked from commit fae0533) * [KSQL-14184]Update Netty to resolve CVE-2025-67735 (#10920) * update netty * update netty to 4.1.130, update netty-tcnative * downgrade netty-tcnative * KSQL-14296 | Update plugin version (#10932) --------- Co-authored-by: Parag Badani <pbadani@users.noreply.github.com> Co-authored-by: semaphore-agent-production[bot] <117926516+semaphore-agent-production[bot]@users.noreply.github.com> Co-authored-by: Jan Werner <105367074+janjwerner-confluent@users.noreply.github.com> Co-authored-by: vi-tayal <vtayal@confluent.io> * fix(ci): increase agent size for cp-jar-build to fix disk space issue (#10939) * Merge Conflict Resolution (from 7.9.x to 8.0.x) (#10937) * KSQL-14176 | CVE fix for jersey-client dependency. (#10915) * KSQL-14176 | CVE fix for jersey-client dependency. (#10916) * KSQL-14176 | CVE fix for jersey-client dependency. (#10915) (cherry picked from commit fae0533) * [KSQL-14184]Update Netty to resolve CVE-2025-67735 (#10920) * update netty * update netty to 4.1.130, update netty-tcnative * downgrade netty-tcnative * KSQL-14296 | Update plugin version (#10932) * CPSEC-1534 | Bump up vert.x dependency version (#10936) --------- Co-authored-by: Parag Badani <pbadani@users.noreply.github.com> Co-authored-by: semaphore-agent-production[bot] <117926516+semaphore-agent-production[bot]@users.noreply.github.com> Co-authored-by: Jan Werner <105367074+janjwerner-confluent@users.noreply.github.com> Co-authored-by: Vishesh Tayal <tayalvishesh83@gmail.com> Co-authored-by: vi-tayal <vtayal@confluent.io> --------- Co-authored-by: semaphore-agent-production[bot] <117926516+semaphore-agent-production[bot]@users.noreply.github.com> Co-authored-by: Parag Badani <pbadani@users.noreply.github.com> Co-authored-by: Jan Werner <105367074+janjwerner-confluent@users.noreply.github.com> Co-authored-by: vi-tayal <vtayal@confluent.io> Co-authored-by: Abhishek Krishna <akrishna@confluent.io> Co-authored-by: Vishesh Tayal <tayalvishesh83@gmail.com> --------- Co-authored-by: semaphore-agent-production[bot] <117926516+semaphore-agent-production[bot]@users.noreply.github.com> Co-authored-by: Parag Badani <pbadani@users.noreply.github.com> Co-authored-by: Jan Werner <105367074+janjwerner-confluent@users.noreply.github.com> Co-authored-by: Vedarth Sharma <vesharma@confluent.io> Co-authored-by: Vedarth Sharma <142404391+VedarthConfluent@users.noreply.github.com> Co-authored-by: Vishesh Tayal <tayalvishesh83@gmail.com> Co-authored-by: vi-tayal <vtayal@confluent.io> Co-authored-by: Abhishek Krishna <akrishna@confluent.io>
1 parent ccd7261 commit 44c6252

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.semaphore/semaphore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ blocks:
7575
task:
7676
agent:
7777
machine:
78-
type: s1-prod-ubuntu24-04-arm64-00
78+
type: s1-prod-ubuntu24-04-arm64-2
7979
env_vars:
8080
- name: COMPONENT_NAME
8181
value: ksqldb

ksqldb-api-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
<plugin>
197197
<groupId>org.apache.maven.plugins</groupId>
198198
<artifactId>maven-shade-plugin</artifactId>
199-
<version>3.6.0</version>
199+
<version>3.6.1</version>
200200
<executions>
201201
<execution>
202202
<phase>package</phase>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<apache.curator.version>5.2.0</apache.curator.version>
133133
<wiremock.version>3.12.0</wiremock.version>
134134
<icu.version>67.1</icu.version>
135-
<vertx.version>4.5.22</vertx.version>
135+
<vertx.version>4.5.24</vertx.version>
136136
<reactive-streams.version>1.0.3</reactive-streams.version>
137137
<skip.docker.build>true</skip.docker.build>
138138
<skip.docker.test>true</skip.docker.test>

0 commit comments

Comments
 (0)