Skip to content

GEODE-10572: Remediation of CVE-2025-22235 #7993

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
JinwooHwang merged 1 commit into from
Mar 13, 2026
+68 −336
Merged

GEODE-10572: Remediation of CVE-2025-22235 #7993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions boms/geode-all-bom/src/test/resources/expected-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,17 +715,27 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>2.6.7</version>
<version>3.3.13</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId>
<version>2.6.7</version>
<version>3.3.13</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<version>3.3.13</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.6.7</version>
<version>3.3.13</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>3.3.13</version>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ...y-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ class DependencyConstraints {
deps.put("jackson.databind.version", "2.18.6")
// Spring Framework 6.x Migration
deps.put("springshell.version", "3.3.3")
deps.put("springframework.version", "6.1.14")
deps.put("springboot.version", "3.3.5")
deps.put("springframework.version", "6.1.21")
deps.put("springboot.version", "3.3.13")
deps.put("springsecurity.version", "6.3.4")
deps.put("springhateoas.version", "2.3.3")
deps.put("springldap.version", "3.2.7")
Expand Down
312 changes: 17 additions & 295 deletions geode-assembly/src/integrationTest/resources/assembly_content.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,284 +296,6 @@ javadoc/org/apache/geode/cache/client/proxy/ProxySocketFactories.html
javadoc/org/apache/geode/cache/client/proxy/SniProxySocketFactory.html
javadoc/org/apache/geode/cache/client/proxy/package-summary.html
javadoc/org/apache/geode/cache/client/proxy/package-tree.html
bin/gfsh
bin/gfsh-completion.bash
bin/gfsh.bat
config/cache.xml
config/gemfire.properties
config/log4j2.xml
config/open-all-jdk-packages-linux-openjdk-17
javadoc/allclasses-index.html
javadoc/allpackages-index.html
javadoc/constant-values.html
javadoc/deprecated-list.html
javadoc/element-list
javadoc/help-doc.html
javadoc/index-all.html
javadoc/index.html
javadoc/javadoc-images/BucketAdvisor-state.png
javadoc/javadoc-images/ConnectionManagerImpl.dia
javadoc/javadoc-images/ConnectionManagerImpl.png
javadoc/javadoc-images/QueueManagerImpl.dia
javadoc/javadoc-images/QueueManagerImpl.png
javadoc/javadoc-images/class-hierarchy.fig
javadoc/javadoc-images/class-hierarchy.gif
javadoc/javadoc-images/client_static_diagram.png
javadoc/javadoc-images/data-serialization-exceptions.fig
javadoc/javadoc-images/data-serialization-exceptions.gif
javadoc/javadoc-images/distribution-managers.fig
javadoc/javadoc-images/distribution-managers.gif
javadoc/javadoc-images/elder.fig
javadoc/javadoc-images/elder.jpg
javadoc/javadoc-images/entry-life-cycle.fig
javadoc/javadoc-images/entry-life-cycle.gif
javadoc/javadoc-images/eventmatrix.xls
javadoc/javadoc-images/example-cache.xml
javadoc/javadoc-images/example-client-cache.xml
javadoc/javadoc-images/example2-cache.xml
javadoc/javadoc-images/example3-cache.xml
javadoc/javadoc-images/extensible-hashing.fig
javadoc/javadoc-images/extensible-hashing.gif
javadoc/javadoc-images/health-classes.gif
javadoc/javadoc-images/jcache-get-flow.fig
javadoc/javadoc-images/jcache-get-flow.pdf
javadoc/javadoc-images/jcache-put-flow.fig
javadoc/javadoc-images/jcache-put-flow.pdf
javadoc/javadoc-images/jcache-update-message-flow.fig
javadoc/javadoc-images/jcache-update-message-flow.pdf
javadoc/javadoc-images/merge-log-files.fig
javadoc/javadoc-images/merge-log-files.gif
javadoc/javadoc-images/partitioned-regions.fig
javadoc/javadoc-images/partitioned-regions.gif
javadoc/javadoc-images/turks.fig
javadoc/javadoc-images/turks.jpg
javadoc/jquery-ui.overrides.css
javadoc/legal/ADDITIONAL_LICENSE_INFO
javadoc/legal/ASSEMBLY_EXCEPTION
javadoc/legal/LICENSE
javadoc/legal/jquery.md
javadoc/legal/jqueryUI.md
javadoc/member-search-index.js
javadoc/module-search-index.js
javadoc/org/apache/geode/CancelCriterion.html
javadoc/org/apache/geode/CancelException.html
javadoc/org/apache/geode/CanonicalInstantiator.html
javadoc/org/apache/geode/CopyException.html
javadoc/org/apache/geode/CopyHelper.html
javadoc/org/apache/geode/DataSerializable.Replaceable.html
javadoc/org/apache/geode/DataSerializable.html
javadoc/org/apache/geode/DataSerializer.html
javadoc/org/apache/geode/Delta.html
javadoc/org/apache/geode/DeltaSerializationException.html
javadoc/org/apache/geode/ForcedDisconnectException.html
javadoc/org/apache/geode/GemFireCacheException.html
javadoc/org/apache/geode/GemFireCheckedException.html
javadoc/org/apache/geode/GemFireConfigException.html
javadoc/org/apache/geode/GemFireException.html
javadoc/org/apache/geode/GemFireIOException.html
javadoc/org/apache/geode/GemFireRethrowable.html
javadoc/org/apache/geode/IncompatibleSystemException.html
javadoc/org/apache/geode/Instantiator.html
javadoc/org/apache/geode/InternalGemFireError.html
javadoc/org/apache/geode/InternalGemFireException.html
javadoc/org/apache/geode/InvalidDeltaException.html
javadoc/org/apache/geode/InvalidValueException.html
javadoc/org/apache/geode/InvalidVersionException.html
javadoc/org/apache/geode/LogWriter.html
javadoc/org/apache/geode/NoSystemException.html
javadoc/org/apache/geode/OutOfOffHeapMemoryException.html
javadoc/org/apache/geode/SerializationException.html
javadoc/org/apache/geode/StatisticDescriptor.html
javadoc/org/apache/geode/Statistics.html
javadoc/org/apache/geode/StatisticsFactory.html
javadoc/org/apache/geode/StatisticsType.html
javadoc/org/apache/geode/StatisticsTypeFactory.html
javadoc/org/apache/geode/SystemConnectException.html
javadoc/org/apache/geode/SystemFailure.html
javadoc/org/apache/geode/SystemIsRunningException.html
javadoc/org/apache/geode/ToDataException.html
javadoc/org/apache/geode/UncreatedSystemException.html
javadoc/org/apache/geode/UnmodifiableException.html
javadoc/org/apache/geode/UnstartedSystemException.html
javadoc/org/apache/geode/admin/AdminConfig.Entry.html
javadoc/org/apache/geode/admin/AdminConfig.html
javadoc/org/apache/geode/admin/AdminDistributedSystem.html
javadoc/org/apache/geode/admin/AdminDistributedSystemFactory.html
javadoc/org/apache/geode/admin/AdminException.html
javadoc/org/apache/geode/admin/AdminXmlException.html
javadoc/org/apache/geode/admin/Alert.html
javadoc/org/apache/geode/admin/AlertLevel.html
javadoc/org/apache/geode/admin/AlertListener.html
javadoc/org/apache/geode/admin/BackupStatus.html
javadoc/org/apache/geode/admin/CacheDoesNotExistException.html
javadoc/org/apache/geode/admin/CacheHealthConfig.html
javadoc/org/apache/geode/admin/CacheServer.html
javadoc/org/apache/geode/admin/CacheServerConfig.html
javadoc/org/apache/geode/admin/CacheVm.html
javadoc/org/apache/geode/admin/CacheVmConfig.html
javadoc/org/apache/geode/admin/ConfigurationParameter.html
javadoc/org/apache/geode/admin/DistributedSystemConfig.ConfigListener.html
javadoc/org/apache/geode/admin/DistributedSystemConfig.html
javadoc/org/apache/geode/admin/DistributedSystemHealthConfig.html
javadoc/org/apache/geode/admin/DistributionLocator.html
javadoc/org/apache/geode/admin/DistributionLocatorConfig.html
javadoc/org/apache/geode/admin/GemFireHealth.Health.html
javadoc/org/apache/geode/admin/GemFireHealth.html
javadoc/org/apache/geode/admin/GemFireHealthConfig.html
javadoc/org/apache/geode/admin/GemFireMemberStatus.html
javadoc/org/apache/geode/admin/ManagedEntity.html
javadoc/org/apache/geode/admin/ManagedEntityConfig.html
javadoc/org/apache/geode/admin/MemberHealthConfig.html
javadoc/org/apache/geode/admin/OperationCancelledException.html
javadoc/org/apache/geode/admin/RegionNotFoundException.html
javadoc/org/apache/geode/admin/RegionSubRegionSnapshot.html
javadoc/org/apache/geode/admin/RuntimeAdminException.html
javadoc/org/apache/geode/admin/Statistic.html
javadoc/org/apache/geode/admin/StatisticResource.html
javadoc/org/apache/geode/admin/SystemMember.html
javadoc/org/apache/geode/admin/SystemMemberBridgeServer.html
javadoc/org/apache/geode/admin/SystemMemberCache.html
javadoc/org/apache/geode/admin/SystemMemberCacheEvent.html
javadoc/org/apache/geode/admin/SystemMemberCacheListener.html
javadoc/org/apache/geode/admin/SystemMemberCacheServer.html
javadoc/org/apache/geode/admin/SystemMemberRegion.html
javadoc/org/apache/geode/admin/SystemMemberRegionEvent.html
javadoc/org/apache/geode/admin/SystemMemberType.html
javadoc/org/apache/geode/admin/SystemMembershipEvent.html
javadoc/org/apache/geode/admin/SystemMembershipListener.html
javadoc/org/apache/geode/admin/UnmodifiableConfigurationException.html
javadoc/org/apache/geode/admin/jmx/Agent.html
javadoc/org/apache/geode/admin/jmx/AgentConfig.html
javadoc/org/apache/geode/admin/jmx/AgentFactory.html
javadoc/org/apache/geode/admin/jmx/package-summary.html
javadoc/org/apache/geode/admin/jmx/package-tree.html
javadoc/org/apache/geode/admin/package-summary.html
javadoc/org/apache/geode/admin/package-tree.html
javadoc/org/apache/geode/annotations/Experimental.html
javadoc/org/apache/geode/annotations/Immutable.html
javadoc/org/apache/geode/annotations/VisibleForTesting.html
javadoc/org/apache/geode/annotations/package-summary.html
javadoc/org/apache/geode/annotations/package-tree.html
javadoc/org/apache/geode/cache/AttributesFactory.html
javadoc/org/apache/geode/cache/AttributesMutator.html
javadoc/org/apache/geode/cache/Cache.html
javadoc/org/apache/geode/cache/CacheCallback.html
javadoc/org/apache/geode/cache/CacheClosedException.html
javadoc/org/apache/geode/cache/CacheEvent.html
javadoc/org/apache/geode/cache/CacheException.html
javadoc/org/apache/geode/cache/CacheExistsException.html
javadoc/org/apache/geode/cache/CacheFactory.html
javadoc/org/apache/geode/cache/CacheListener.html
javadoc/org/apache/geode/cache/CacheLoader.html
javadoc/org/apache/geode/cache/CacheLoaderException.html
javadoc/org/apache/geode/cache/CacheRuntimeException.html
javadoc/org/apache/geode/cache/DuplicatePrimaryPartitionException.html
javadoc/org/apache/geode/cache/DynamicRegionFactory.Config.html
javadoc/org/apache/geode/cache/DynamicRegionFactory.html
javadoc/org/apache/geode/cache/DynamicRegionListener.html
javadoc/org/apache/geode/cache/EntryDestroyedException.html
javadoc/org/apache/geode/cache/EntryEvent.html
javadoc/org/apache/geode/cache/EntryExistsException.html
javadoc/org/apache/geode/cache/EntryNotFoundException.html
javadoc/org/apache/geode/cache/EntryOperation.html
javadoc/org/apache/geode/cache/EvictionAction.html
javadoc/org/apache/geode/cache/EvictionAlgorithm.html
javadoc/org/apache/geode/cache/EvictionAttributes.html
javadoc/org/apache/geode/cache/EvictionAttributesMutator.html
javadoc/org/apache/geode/cache/ExpirationAction.html
javadoc/org/apache/geode/cache/ExpirationAttributes.html
javadoc/org/apache/geode/cache/FailedSynchronizationException.html
javadoc/org/apache/geode/cache/FixedPartitionAttributes.html
javadoc/org/apache/geode/cache/FixedPartitionResolver.html
javadoc/org/apache/geode/cache/GatewayConfigurationException.html
javadoc/org/apache/geode/cache/GatewayException.html
javadoc/org/apache/geode/cache/GemFireCache.html
javadoc/org/apache/geode/cache/IncompatibleVersionException.html
javadoc/org/apache/geode/cache/InterestPolicy.html
javadoc/org/apache/geode/cache/InterestRegistrationEvent.html
javadoc/org/apache/geode/cache/InterestRegistrationListener.html
javadoc/org/apache/geode/cache/InterestResultPolicy.html
javadoc/org/apache/geode/cache/LoaderHelper.html
javadoc/org/apache/geode/cache/LossAction.html
javadoc/org/apache/geode/cache/LowMemoryException.html
javadoc/org/apache/geode/cache/MembershipAttributes.html
javadoc/org/apache/geode/cache/MirrorType.html
javadoc/org/apache/geode/cache/NoQueueServersAvailableException.html
javadoc/org/apache/geode/cache/NoSubscriptionServersAvailableException.html
javadoc/org/apache/geode/cache/Operation.html
javadoc/org/apache/geode/cache/OperationAbortedException.html
javadoc/org/apache/geode/cache/PartitionAttributes.html
javadoc/org/apache/geode/cache/PartitionAttributesFactory.html
javadoc/org/apache/geode/cache/PartitionResolver.html
javadoc/org/apache/geode/cache/PartitionedRegionDistributionException.html
javadoc/org/apache/geode/cache/PartitionedRegionStorageException.html
javadoc/org/apache/geode/cache/Region.Entry.html
javadoc/org/apache/geode/cache/Region.html
javadoc/org/apache/geode/cache/RegionAccessException.html
javadoc/org/apache/geode/cache/RegionAttributes.html
javadoc/org/apache/geode/cache/RegionDestroyedException.html
javadoc/org/apache/geode/cache/RegionDistributionException.html
javadoc/org/apache/geode/cache/RegionEvent.html
javadoc/org/apache/geode/cache/RegionExistsException.html
javadoc/org/apache/geode/cache/RegionFactory.html
javadoc/org/apache/geode/cache/RegionMembershipListener.html
javadoc/org/apache/geode/cache/RegionReinitializedException.html
javadoc/org/apache/geode/cache/RegionRoleException.html
javadoc/org/apache/geode/cache/RegionRoleListener.html
javadoc/org/apache/geode/cache/RegionService.html
javadoc/org/apache/geode/cache/RegionShortcut.html
javadoc/org/apache/geode/cache/RequiredRoles.html
javadoc/org/apache/geode/cache/ResourceException.html
javadoc/org/apache/geode/cache/ResumptionAction.html
javadoc/org/apache/geode/cache/RoleEvent.html
javadoc/org/apache/geode/cache/RoleException.html
javadoc/org/apache/geode/cache/Scope.html
javadoc/org/apache/geode/cache/SerializedCacheValue.html
javadoc/org/apache/geode/cache/StatisticsDisabledException.html
javadoc/org/apache/geode/cache/SubscriptionAttributes.html
javadoc/org/apache/geode/cache/SynchronizationCommitConflictException.html
javadoc/org/apache/geode/cache/TimeoutException.html
javadoc/org/apache/geode/cache/TransactionDataNodeHasDepartedException.html
javadoc/org/apache/geode/cache/TransactionDataNotColocatedException.html
javadoc/org/apache/geode/cache/TransactionDataRebalancedException.html
javadoc/org/apache/geode/cache/TransactionEvent.html
javadoc/org/apache/geode/cache/TransactionException.html
javadoc/org/apache/geode/cache/TransactionId.html
javadoc/org/apache/geode/cache/TransactionInDoubtException.html
javadoc/org/apache/geode/cache/TransactionListener.html
javadoc/org/apache/geode/cache/TransactionWriter.html
javadoc/org/apache/geode/cache/TransactionWriterException.html
javadoc/org/apache/geode/cache/UnsupportedOperationInTransactionException.html
javadoc/org/apache/geode/cache/UnsupportedVersionException.html
javadoc/org/apache/geode/cache/VersionException.html
javadoc/org/apache/geode/cache/asyncqueue/AsyncEvent.html
javadoc/org/apache/geode/cache/asyncqueue/AsyncEventListener.html
javadoc/org/apache/geode/cache/asyncqueue/AsyncEventQueue.html
javadoc/org/apache/geode/cache/asyncqueue/AsyncEventQueueFactory.html
javadoc/org/apache/geode/cache/asyncqueue/package-summary.html
javadoc/org/apache/geode/cache/asyncqueue/package-tree.html
javadoc/org/apache/geode/cache/client/AllConnectionsInUseException.html
javadoc/org/apache/geode/cache/client/ClientCache.html
javadoc/org/apache/geode/cache/client/ClientCacheFactory.html
javadoc/org/apache/geode/cache/client/ClientNotReadyException.html
javadoc/org/apache/geode/cache/client/ClientRegionFactory.html
javadoc/org/apache/geode/cache/client/ClientRegionShortcut.html
javadoc/org/apache/geode/cache/client/NoAvailableLocatorsException.html
javadoc/org/apache/geode/cache/client/NoAvailableServersException.html
javadoc/org/apache/geode/cache/client/Pool.html
javadoc/org/apache/geode/cache/client/PoolFactory.html
javadoc/org/apache/geode/cache/client/PoolManager.html
javadoc/org/apache/geode/cache/client/ServerConnectivityException.html
javadoc/org/apache/geode/cache/client/ServerOperationException.html
javadoc/org/apache/geode/cache/client/ServerRefusedConnectionException.html
javadoc/org/apache/geode/cache/client/SocketFactory.html
javadoc/org/apache/geode/cache/client/SubscriptionNotEnabledException.html
javadoc/org/apache/geode/cache/client/package-summary.html
javadoc/org/apache/geode/cache/client/package-tree.html
javadoc/org/apache/geode/cache/client/proxy/ProxySocketFactories.html
javadoc/org/apache/geode/cache/client/proxy/SniProxySocketFactory.html
javadoc/org/apache/geode/cache/client/proxy/package-summary.html
javadoc/org/apache/geode/cache/client/proxy/package-tree.html
javadoc/org/apache/geode/cache/configuration/CacheConfig.AsyncEventQueue.html
javadoc/org/apache/geode/cache/configuration/CacheConfig.CacheServer.html
javadoc/org/apache/geode/cache/configuration/CacheConfig.GatewayHub.Gateway.GatewayEndpoint.html
Expand Down Expand Up @@ -1237,7 +959,7 @@ lib/geode-tcp-server-0.0.0.jar
lib/geode-unsafe-0.0.0.jar
lib/geode-wan-0.0.0.jar
lib/gfsh-dependencies.jar
lib/hibernate-validator-8.0.1.Final.jar
lib/hibernate-validator-8.0.2.Final.jar
lib/httpclient5-5.4.4.jar
lib/httpcore5-5.3.4.jar
lib/httpcore5-h2-5.3.4.jar
Expand Down Expand Up @@ -1289,7 +1011,7 @@ lib/jna-5.11.0.jar
lib/jna-platform-5.11.0.jar
lib/joda-time-2.12.7.jar
lib/jopt-simple-5.0.4.jar
lib/jul-to-slf4j-2.0.16.jar
lib/jul-to-slf4j-2.0.17.jar
lib/log4j-api-2.25.3.jar
lib/log4j-core-2.25.3.jar
lib/log4j-jcl-2.25.3.jar
Expand Down Expand Up @@ -1318,33 +1040,33 @@ lib/shiro-crypto-cipher-2.1.0.jar
lib/shiro-crypto-core-2.1.0.jar
lib/shiro-crypto-hash-2.1.0.jar
lib/shiro-event-2.1.0.jar
lib/shiro-lang-2.1.0.jar
lib/shiro-hashes-argon2-2.1.0.jar
lib/shiro-hashes-bcrypt-2.1.0.jar
lib/shiro-lang-2.1.0.jar
lib/slf4j-api-2.0.17.jar
lib/snakeyaml-2.3.jar
lib/snappy-0.5.jar
lib/spring-aop-6.1.14.jar
lib/spring-beans-6.1.14.jar
lib/spring-boot-3.3.5.jar
lib/spring-boot-autoconfigure-3.3.5.jar
lib/spring-boot-starter-3.3.5.jar
lib/spring-boot-starter-logging-3.3.5.jar
lib/spring-boot-starter-validation-3.3.5.jar
lib/spring-context-6.1.14.jar
lib/spring-core-6.1.14.jar
lib/spring-expression-6.1.14.jar
lib/spring-jcl-6.1.14.jar
lib/spring-messaging-6.1.14.jar
lib/spring-aop-6.1.21.jar
lib/spring-beans-6.1.21.jar
lib/spring-boot-3.3.13.jar
lib/spring-boot-autoconfigure-3.3.13.jar
lib/spring-boot-starter-3.3.13.jar
lib/spring-boot-starter-logging-3.3.13.jar
lib/spring-boot-starter-validation-3.3.13.jar
lib/spring-context-6.1.21.jar
lib/spring-core-6.1.21.jar
lib/spring-expression-6.1.21.jar
lib/spring-jcl-6.1.21.jar
lib/spring-messaging-6.1.21.jar
lib/spring-shell-autoconfigure-3.3.3.jar
lib/spring-shell-core-3.3.3.jar
lib/spring-shell-standard-3.3.3.jar
lib/spring-shell-standard-commands-3.3.3.jar
lib/spring-shell-starter-3.3.3.jar
lib/spring-shell-table-3.3.3.jar
lib/spring-web-6.1.14.jar
lib/spring-web-6.1.21.jar
lib/swagger-annotations-2.2.22.jar
lib/tomcat-embed-el-10.1.31.jar
lib/tomcat-embed-el-10.1.42.jar
lib/txw2-4.0.2.jar
tools/Extensions/geode-web-0.0.0.war
tools/Extensions/geode-web-api-0.0.0.war
Expand Down
Loading
Loading