Skip to content

Commit ca8955a

Browse files
committed
Merge 25.11 to develop
2 parents 115a4c9 + 41483fa commit ca8955a

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

build.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,20 @@ allprojects {
334334
force "org.bouncycastle:bcprov-jdk18on:${bouncycastleVersion}"
335335
// force consistency in docker and connectors and saml
336336
force "org.bouncycastle:bcpkix-jdk18on:${bouncycastleVersion}"
337+
// docker dependency: force to mitigate CVEs
338+
force "io.netty:netty-resolver:${nettyVersion}"
339+
force "io.netty:netty-resolver-dns:${nettyVersion}"
340+
force "io.netty:netty-handler:${nettyVersion}"
341+
force "io.netty:netty-handler-proxy:${nettyVersion}"
342+
force "io.netty:netty-buffer:${nettyVersion}"
343+
force "io.netty:netty-transport:${nettyVersion}"
344+
force "io.netty:netty-codec-socks:${nettyVersion}"
345+
force "io.netty:netty-codec:${nettyVersion}"
346+
force "io.netty:netty-common:${nettyVersion}"
347+
force "io.netty:netty-codec-http:${nettyVersion}"
348+
force "io.netty:netty-codec-http2:${nettyVersion}"
349+
force "io.netty:netty-transport-native-epoll:${nettyVersion}"
350+
force "io.netty:netty-transport-native-kqueue:${nettyVersion}"
337351

338352
// Force consistency for dependencies from pipeline and query
339353
force "org.dom4j:dom4j:${dom4jVersion}"

gradle.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ commonsLangVersion=2.6
134134
commonsLoggingVersion=1.3.5
135135
commonsMath3Version=3.6.1
136136
commonsPoolVersion=1.6
137-
commonsTextVersion=1.14.0
137+
commonsTextVersion=1.15.0
138138
commonsValidatorVersion=1.10.1
139139
commonsVfs2Version=2.10.0
140140

@@ -247,6 +247,9 @@ luceneVersion=9.12.3
247247

248248
mssqlJdbcVersion=13.2.1.jre11
249249

250+
# force for docker
251+
nettyVersion=4.2.9.Final
252+
250253
objenesisVersion=1.0
251254

252255
opencsvVersion=2.3

0 commit comments

Comments
 (0)