Skip to content

[bot] Merge 25.11 to develop (Conflicts) #1246

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
github-actions merged 3 commits into from
Dec 23, 2025
Merged

[bot] Merge 25.11 to develop (Conflicts) #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a09528
Update to the latest Netty version (#1240)
labkey-adam Dec 18, 2025
41483fa
Merge 25.7 to 25.11
cnathe Dec 22, 2025
faf534f
Merge 25.11 to develop
cnathe Dec 23, 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
14 changes: 14 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,20 @@ allprojects {
force "org.bouncycastle:bcprov-jdk18on:${bouncycastleVersion}"
// force consistency in docker and connectors and saml
force "org.bouncycastle:bcpkix-jdk18on:${bouncycastleVersion}"
// docker dependency: force to mitigate CVEs
force "io.netty:netty-resolver:${nettyVersion}"
force "io.netty:netty-resolver-dns:${nettyVersion}"
force "io.netty:netty-handler:${nettyVersion}"
force "io.netty:netty-handler-proxy:${nettyVersion}"
force "io.netty:netty-buffer:${nettyVersion}"
force "io.netty:netty-transport:${nettyVersion}"
force "io.netty:netty-codec-socks:${nettyVersion}"
force "io.netty:netty-codec:${nettyVersion}"
force "io.netty:netty-common:${nettyVersion}"
force "io.netty:netty-codec-http:${nettyVersion}"
force "io.netty:netty-codec-http2:${nettyVersion}"
force "io.netty:netty-transport-native-epoll:${nettyVersion}"
force "io.netty:netty-transport-native-kqueue:${nettyVersion}"

// Force consistency for dependencies from pipeline and query
force "org.dom4j:dom4j:${dom4jVersion}"
Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ commonsLangVersion=2.6
commonsLoggingVersion=1.3.5
commonsMath3Version=3.6.1
commonsPoolVersion=1.6
commonsTextVersion=1.14.0
commonsTextVersion=1.15.0
commonsValidatorVersion=1.10.1
commonsVfs2Version=2.10.0

Expand Down Expand Up @@ -247,6 +247,9 @@ luceneVersion=9.12.3

mssqlJdbcVersion=13.2.1.jre11

# force for docker
nettyVersion=4.2.9.Final

objenesisVersion=1.0

opencsvVersion=2.3
Expand Down