Skip to content

Update dependencies prepare for 2025.0.1 #641

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
onobc merged 5 commits into from
Oct 9, 2025
Merged

Update dependencies prepare for 2025.0.1 #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0ab400
Update dependencies for 2025.0.1 release
onobc Oct 8, 2025
4732123
Update snappy-java to 1.1.10.5
onobc Oct 8, 2025
48a18aa
Update nimbus-jose-jwt to 9.37.4
onobc Oct 9, 2025
6640652
Make scan-jar.sh reflect reality
onobc Oct 9, 2025
f04486d
Update grpc-netty-shaded to 1.75.0
onobc Oct 9, 2025
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
25 changes: 24 additions & 1 deletion applications/source/debezium-source/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<properties>
<json-unit.version>1.25.1</json-unit.version>
<grpc-netty-shaded.version>1.75.0</grpc-netty-shaded.version>
</properties>

<artifactId>debezium-source</artifactId>
Expand All @@ -23,8 +24,19 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spring-debezium-supplier</artifactId>
<!-- Exclude grpc-netty-shaded due to CVE-2025-55163 -->
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
<version>${grpc-netty-shaded.version}</version>
</dependency>

<!-- TEST -->
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
Expand Down Expand Up @@ -124,8 +136,19 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spring-debezium-supplier</artifactId>
<!-- Exclude grpc-netty-shaded due to CVE-2025-55163 -->
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
<version>${grpc-netty-shaded.version}</version>
</dependency> <dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-composite-function-support</artifactId>
<version>${stream-apps-core.version}</version>
Expand Down
67 changes: 58 additions & 9 deletions applications/stream-applications-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,21 @@

<properties>
<stream-apps-core.version>5.1.1-SNAPSHOT</stream-apps-core.version>
<java-functions.version>5.1.0</java-functions.version>
<java-functions.version>5.1.1</java-functions.version>
<prometheus-rsocket.version>1.5.3</prometheus-rsocket.version>
<spring-cloud-dataflow-apps-generator-plugin.version>1.1.1</spring-cloud-dataflow-apps-generator-plugin.version>
<spring-cloud-dataflow-apps-docs-plugin.version>1.1.1</spring-cloud-dataflow-apps-docs-plugin.version>
<spring-cloud-dataflow-apps-metadata-plugin.version>1.1.1</spring-cloud-dataflow-apps-metadata-plugin.version>
<java-cfenv-boot.version>3.2.0</java-cfenv-boot.version>
<spring-cloud-services.version>4.1.6</spring-cloud-services.version>
<spring-cloud-services.version>4.1.8</spring-cloud-services.version>

<!-- Override for CVE-2025-53864 -->
<snappy-java.version>1.1.10.5</snappy-java.version>

<!-- Override for CVE-2025-53864 -->
<nimbus-oauth2-oidc-sdk.version>9.43.6</nimbus-oauth2-oidc-sdk.version>
<nimbus-jose-jwt.version>9.37.4</nimbus-jose-jwt.version>

</properties>

<modules>
Expand Down Expand Up @@ -143,13 +151,6 @@
</metadata>
<maven>
<dependencyManagement>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>${spring-cloud-function.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
Expand Down Expand Up @@ -189,10 +190,22 @@
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus-simpleclient</artifactId>
</dependency>
<!-- Exclude snappy-java due to CVE-2023-43642 -->
<dependency>
<groupId>io.micrometer.prometheus</groupId>
<artifactId>prometheus-rsocket-spring</artifactId>
<version>${prometheus-rsocket.version}</version>
<exclusions>
<exclude>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</exclude>
</exclusions>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>${snappy-java.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
Expand Down Expand Up @@ -248,6 +261,42 @@
<groupId>io.pivotal.spring.cloud</groupId>
<artifactId>spring-cloud-services-starter-config-client</artifactId>
<version>${spring-cloud-services.version}</version>
<!-- oauth2-client brings in Nimbus w/ CVE-2025-53864 -->
<exclusions>
<exclude>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-client</artifactId>
</exclude>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-client</artifactId>
<!-- oauth2-oidc-sdk brings in nimbus-jose-jwt w/ CVE-2025-53864 -->
<exclusions>
<exclude>
<groupId>com.nimbusds</groupId>
<artifactId>oauth2-oidc-sdk</artifactId>
</exclude>
</exclusions>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>oauth2-oidc-sdk</artifactId>
<version>${nimbus-oauth2-oidc-sdk.version}</version>
<!-- oauth2-oidc-sdk brings in nimbus-jose-jwt w/ CVE-2025-53864 -->
<exclusions>
<exclude>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
</exclude>
</exclusions>
</dependency>
<!-- nimbus-jose-jwt override for CVE-2025-53864 -->
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>${nimbus-jose-jwt.version}</version>
</dependency>
</dependencies>
</maven>
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public abstract class KafkaConfig {
* The KafkaContainer.
*/
public final static KafkaContainer kafka = new KafkaContainer(
DockerImageName.parse("confluentinc/cp-kafka"))
DockerImageName.parse("confluentinc/cp-kafka:7.5.0"))
.withExposedPorts(9092, 9093)
.withNetwork(Network.SHARED)
.withStartupTimeout(Duration.ofSeconds(120))
Expand Down
26 changes: 8 additions & 18 deletions scan-jar.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,12 @@
SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
SCDIR=$(realpath $SCDIR)
if [[ "$1" != *"-sources.jar" ]] && [[ "$1" != *"-javadoc.jar" ]]; then
if [ "$TRIVY_UPLOAD" == "true" ]; then
echo "Scanning:$1"
trivy rootfs --exit-code 1 --format sarif -o "$1.sarif" "$1"
if [ -f "$1.sarif" ]; then
if [ -f $SCDIR/runs.sarif ]; then
echo "," >> "$SCDIR/runs.sarif"
fi
jq -c '.runs | .[]' "$1.sarif" >> "$SCDIR/runs.sarif"
else
echo "Could not find:$1.sarif"
fi
else
trivy rootfs --exit-code 1 -q "$1"
fi
else
if [ "$TRIVY_UPLOAD" == "true" ]; then
echo "Skipping $1"
fi
trivy rootfs \
--scanners vuln \
--severity HIGH,CRITICAL \
--exit-code 1 \
--quiet \
--ignorefile .trivyignore \
--show-suppressed \
--format table "$1"
fi
23 changes: 4 additions & 19 deletions stream-applications-build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,19 @@
<nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
<disable.nohttp.checks>true</disable.nohttp.checks>
<spring-javaformat-checkstyle.version>0.0.43</spring-javaformat-checkstyle.version>
<spring-boot.version>3.4.2</spring-boot.version>
<spring-cloud.version>2024.0.0</spring-cloud.version>
<!-- SC bom override to pickup spring-cloud/spring-cloud-function#1224 -->
<spring-cloud-function.version>4.2.1</spring-cloud-function.version>
<spring-boot.version>3.4.10</spring-boot.version>
<spring-cloud.version>2024.0.2</spring-cloud.version>
<!-- =================================================================== -->
<!-- Required only for release train docs generation in -->
<!-- /stream-applications-release-train/stream-applications-docs/pom.xml -->
<spring.version>6.2.2</spring.version>
<spring-cloud-stream-dependencies.version>4.2.0</spring-cloud-stream-dependencies.version>
<spring.version>6.2.11</spring.version>
<spring-cloud-stream-dependencies.version>4.2.2</spring-cloud-stream-dependencies.version>
<!-- =================================================================== -->
<mockserver.version>5.15.0</mockserver.version>
<apache-ivy.version>2.5.2</apache-ivy.version>
<curator.version>5.5.0</curator.version>
<mavenThreads>1</mavenThreads>
<commons-compress.version>1.26.2</commons-compress.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
<okhttp3.version>4.12.0</okhttp3.version>
<!--suppress UnresolvedMavenProperty -->
<buildName>${env.BUILD_NAME}</buildName>
Expand Down Expand Up @@ -79,25 +76,13 @@
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>${spring-cloud-function.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
Expand Down