Skip to content

Backport develop commits to support/2.0 for the 2.0.3 release - #8038

Closed
JinwooHwang wants to merge 10 commits into
apache:support/2.0from
JinwooHwang:backport/2.0.3-security-updates
Closed

Backport develop commits to support/2.0 for the 2.0.3 release#8038
JinwooHwang wants to merge 10 commits into
apache:support/2.0from
JinwooHwang:backport/2.0.3-security-updates

Conversation

@JinwooHwang

@JinwooHwang JinwooHwang commented Aug 24, 2026

Copy link
Copy Markdown
Contributor

Backports 10 commits from develop to support/2.0 for the 2.0.3 release.

Security remediations (dependency upgrades)

Advisory Component Change JIRA Upstream PR
CVE-2026-54428 httpcore5, httpcore5-h2 5.3.6 → 5.4.3 GEODE-10590 #8016
GHSA-2m67-wjpj-xhg9 Jackson 2.21.2 → 2.21.5 GEODE-10589 #8015
CVE-2026-40984 Micrometer 1.14.0 → 1.15.12 GEODE-10592 #8018
CVE-2026-8763 Bouncy Castle 1.84 → 1.85 GEODE-10606 #8032
CVE-2026-10050 Jetty 12.0.33 → 12.0.37 GEODE-10605 #8031
CVE-2026-49268 Apache Shiro 2.1.0 → 3.0.0 GEODE-10607 #8033
SNYK-JAVA-ORGAPACHELOGGINGLOG4J-17954276 Log4j 2.25.4 → 2.25.5 GEODE-10604 #8030

JinwooHwang and others added 10 commits August 24, 2026 10:00
Partial backport of [GEODE-10592] Remediation of CVE-2026-40984 (apache#8018),
commit 9780122 on develop.

Only the micrometer dependency bump is taken. The rest of that commit does
not apply to support/2.0:
  - GitHub Actions version pinning (checkout@v4.2.2, setup-java@v4.7.1)
    targets develop's workflow files, which have diverged on this branch.
  - The shiro 2.2.1 -> 2.1.0 change reverted apache#8017; support/2.0 is already
    at 2.1.0, so it is a no-op here.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* Remediation of CVE-2026-54428

* CI build failure

(cherry picked from commit e3cb1f0)
* feature/GEODE-10589

* CI build failure

(cherry picked from commit 48fe054)
Upgrades shiro 2.1.0 -> 3.0.0 and slf4j-api 2.0.17 -> 2.0.18.

(cherry picked from commit d284679)

Conflicts were resolved to take only the two dependency changes this commit
is about. The following develop-only drift that appeared in the conflict
regions was deliberately NOT taken, as it is unrelated to this CVE and
support/2.0 pins these intentionally:
  - bouncycastle 1.84 (develop is on 1.85; pinned here by GEODE-10583)
  - log4j 2.25.4 (develop is on 2.25.5)
  - jetty 12.0.33 (develop is on 12.0.37)
  - snakeyaml 2.3 (develop is on 2.5)

Two upstream defects in the original commit were also not carried over;
both were corrected on develop by [GEODE-10609] (apache#8035):
  - a corrupted fixture line, "jetty-io-1git 2.0.37.jar"
  - jul-to-slf4j listed as 2.0.18, which the build does not actually
    resolve; it remains 2.0.17 here

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
…p.converter.ServerSerializableObjectHttpMessageConverter (apache#8024)

* Removal of  org.apache.geode.management.internal.web.http.converter.ServerSerializableObjectHttpMessageConverter

* codeql warning

* autobuild for go

* These changes allow gfsh to perform complex MBean queries over HTTP without requiring the insecure SerializableObjectHttpMessageConverter in the request body, maintaining the project's security posture while restoring full JMX remoting functionality.

* formatting fix

* Delete .github/workflows/codeql.yml

* restored codeql.yml

* restored codeql.yml

* Delete .mvn/wrapper/maven-wrapper.jar

* Delete .mvn/wrapper/maven-wrapper.properties

* restored codeql.yml

(cherry picked from commit b37841a)
…ingObjectInputStream (apache#8025)

* Secure JMX query expression deserialization via ValidatingObjectInputStream

* fix formatting

* license

(cherry picked from commit 5fcca74)
Remediation of SNYK-JAVA-ORGAPACHELOGGINGLOG4J-17954276

(cherry picked from commit 4e02b54)
Bumps bouncycastle 1.84 -> 1.85.

(cherry picked from commit 98d461e)

Applied after apache#8033, so the fixture and DependencyConstraints conflict
regions carried this commit's older context (shiro 2.1.0, slf4j 2.0.17).
Only the bouncycastle bump was taken; shiro 3.0.0 and slf4j 2.0.18 from
apache#8033 are preserved.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Bumps jetty 12.0.33 -> 12.0.37, which transitively brings asm 9.9.1 -> 9.10.1.

(cherry picked from commit b507bd3)

Applied after apache#8032/apache#8033, so the two classpath fixtures conflicted on this
commit's older context (shiro 2.1.0, slf4j 2.0.17, bcprov reordering). Only
the jetty and asm changes were taken; shiro 3.0.0, slf4j 2.0.18, bcprov 1.85
and snakeyaml 2.3 are preserved.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* GEODE-10610 gfsh - list member failure

* :geode-assembly:integrationTest
BundledJarsJUnitTest. verifyBundledJarsHaveNotChanged and GfshDependencyJarIntegrationTest. verifyManifestClassPath

(cherry picked from commit 621c3d3)
@JinwooHwang JinwooHwang changed the title Backport security updates from develop to support/2.0 for 2.0.3 Backport develop commits to support/2.0 for the 2.0.3 release Aug 24, 2026
@JinwooHwang
JinwooHwang deleted the backport/2.0.3-security-updates branch August 24, 2026 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant