This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 166f4b3c04 Bump cxf.ehcache3.version from 3.11.1 to 3.12.0 (#3025)
166f4b3c04 is described below
commit 166f4b3c04c12445b1d17b7d10cedaa2ae3b12c0
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Apr 9 13:47:10 2026 -0400
Bump cxf.ehcache3.version from 3.11.1 to 3.12.0 (#3025)
* Bump cxf.ehcache3.version from 3.11.1 to 3.12.0
Bumps `cxf.ehcache3.version` from 3.11.1 to 3.12.0.
Updates `org.ehcache:ehcache` from 3.11.1 to 3.12.0
- [Release notes](https://github.com/ehcache/ehcache3/releases)
- [Commits](https://github.com/ehcache/ehcache3/compare/v3.11.1...v3.12.0)
Updates `org.ehcache.modules:ehcache-107` from 3.11.1 to 3.12.0
- [Release notes](https://github.com/ehcache/ehcache3/releases)
- [Commits](https://github.com/ehcache/ehcache3/compare/v3.11.1...v3.12.0)
---
updated-dependencies:
- dependency-name: org.ehcache:ehcache
dependency-version: 3.12.0
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.ehcache.modules:ehcache-107
dependency-version: 3.12.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
* Address changes on EHCache APIs exception signatures
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andriy Redko <[email protected]>
---
parent/pom.xml | 2 +-
.../security/saml/sso/EHCacheTokenReplayCache.java | 29 ++++++-----
.../saml/sso/state/EHCacheSPStateManager.java | 58 ++++++++++++----------
3 files changed, 50 insertions(+), 39 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 2a3d74298b..d779ec7ea1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -113,7 +113,7 @@
<cxf.dropwizard3.version>3.2.6</cxf.dropwizard3.version>
<cxf.dropwizard4.version>4.2.38</cxf.dropwizard4.version>
<cxf.dropwizard5.version>5.0.6</cxf.dropwizard5.version>
- <cxf.ehcache3.version>3.11.1</cxf.ehcache3.version>
+ <cxf.ehcache3.version>3.12.0</cxf.ehcache3.version>
<cxf.el-api.version>6.0.1</cxf.el-api.version>
<cxf.jvnet.jaxb.version>4.0.12</cxf.jvnet.jaxb.version>
<cxf.geronimo.jta.version>1.1.1</cxf.geronimo.jta.version>
diff --git
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
index 43a7ac44b1..cc53375e24 100644
---
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
+++
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
@@ -82,18 +82,23 @@ public class EHCacheTokenReplayCache implements
TokenReplayCache<String> {
// ignore
}
- XmlConfiguration xmlConfig = new
XmlConfiguration(getConfigFileURL(configFileURL));
- CacheConfigurationBuilder<String, EHCacheValue> configurationBuilder =
- xmlConfig.newCacheConfigurationBuilderFromTemplate(CACHE_KEY,
- String.class, EHCacheValue.class);
- // Note, we don't require strong random values here
- String diskKey = CACHE_KEY + "-" + Math.abs(new Random().nextInt());
- cacheManager =
CacheManagerBuilder.newCacheManagerBuilder().withCache(CACHE_KEY,
configurationBuilder)
- .with(CacheManagerBuilder.persistence(new
File(System.getProperty("java.io.tmpdir"), diskKey))).build();
-
- cacheManager.init();
- cache = cacheManager.getCache(CACHE_KEY, String.class,
EHCacheValue.class);
-
+ try {
+ XmlConfiguration xmlConfig = new
XmlConfiguration(getConfigFileURL(configFileURL));
+ CacheConfigurationBuilder<String, EHCacheValue>
configurationBuilder =
+
xmlConfig.newCacheConfigurationBuilderFromTemplate(CACHE_KEY,
+ String.class, EHCacheValue.class);
+ // Note, we don't require strong random values here
+ String diskKey = CACHE_KEY + "-" + Math.abs(new
Random().nextInt());
+ cacheManager = CacheManagerBuilder.newCacheManagerBuilder()
+ .withCache(CACHE_KEY, configurationBuilder)
+ .with(CacheManagerBuilder.persistence(new
File(System.getProperty("java.io.tmpdir"), diskKey)))
+ .build();
+
+ cacheManager.init();
+ cache = cacheManager.getCache(CACHE_KEY, String.class,
EHCacheValue.class);
+ } catch (final ReflectiveOperationException ex) {
+ throw (IllegalAccessException) new
IllegalAccessException(ex.getMessage()).initCause(ex);
+ }
}
private URL getConfigFileURL(URL suppliedConfigFileURL) {
diff --git
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
index 52f0d64a1c..e7198f8275 100644
---
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
+++
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
@@ -79,32 +79,38 @@ public class EHCacheSPStateManager implements
SPStateManager {
// ignore
}
- XmlConfiguration xmlConfig = new
XmlConfiguration(getConfigFileURL(configFileURL));
- CacheConfigurationBuilder<String, RequestState>
requestConfigurationBuilder =
-
xmlConfig.newCacheConfigurationBuilderFromTemplate(REQUEST_CACHE_KEY,
- String.class, RequestState.class);
-
- // Note, we don't require strong random values here
- String diskKey = REQUEST_CACHE_KEY + "-" + Math.abs(new
Random().nextInt());
- requestCacheManager = CacheManagerBuilder.newCacheManagerBuilder()
- .withCache(REQUEST_CACHE_KEY, requestConfigurationBuilder)
- .with(CacheManagerBuilder.persistence(new
File(System.getProperty("java.io.tmpdir"), diskKey))).build();
-
- requestCacheManager.init();
- requestCache = requestCacheManager.getCache(REQUEST_CACHE_KEY,
String.class, RequestState.class);
-
- CacheConfigurationBuilder<String, ResponseState>
responseConfigurationBuilder =
-
xmlConfig.newCacheConfigurationBuilderFromTemplate(RESPONSE_CACHE_KEY,
- String.class, ResponseState.class);
-
- // Note, we don't require strong random values here
- diskKey = RESPONSE_CACHE_KEY + "-" + Math.abs(new Random().nextInt());
- responseCacheManager = CacheManagerBuilder.newCacheManagerBuilder()
- .withCache(RESPONSE_CACHE_KEY, responseConfigurationBuilder)
- .with(CacheManagerBuilder.persistence(new
File(System.getProperty("java.io.tmpdir"), diskKey))).build();
-
- responseCacheManager.init();
- responseCache = responseCacheManager.getCache(RESPONSE_CACHE_KEY,
String.class, ResponseState.class);
+ try {
+ XmlConfiguration xmlConfig = new
XmlConfiguration(getConfigFileURL(configFileURL));
+ CacheConfigurationBuilder<String, RequestState>
requestConfigurationBuilder =
+
xmlConfig.newCacheConfigurationBuilderFromTemplate(REQUEST_CACHE_KEY,
+ String.class, RequestState.class);
+
+ // Note, we don't require strong random values here
+ String diskKey = REQUEST_CACHE_KEY + "-" + Math.abs(new
Random().nextInt());
+ requestCacheManager = CacheManagerBuilder.newCacheManagerBuilder()
+ .withCache(REQUEST_CACHE_KEY, requestConfigurationBuilder)
+ .with(CacheManagerBuilder.persistence(new
File(System.getProperty("java.io.tmpdir"), diskKey)))
+ .build();
+
+ requestCacheManager.init();
+ requestCache = requestCacheManager.getCache(REQUEST_CACHE_KEY,
String.class, RequestState.class);
+
+ CacheConfigurationBuilder<String, ResponseState>
responseConfigurationBuilder =
+
xmlConfig.newCacheConfigurationBuilderFromTemplate(RESPONSE_CACHE_KEY,
+ String.class, ResponseState.class);
+
+ // Note, we don't require strong random values here
+ diskKey = RESPONSE_CACHE_KEY + "-" + Math.abs(new
Random().nextInt());
+ responseCacheManager = CacheManagerBuilder.newCacheManagerBuilder()
+ .withCache(RESPONSE_CACHE_KEY,
responseConfigurationBuilder)
+ .with(CacheManagerBuilder.persistence(new
File(System.getProperty("java.io.tmpdir"), diskKey)))
+ .build();
+
+ responseCacheManager.init();
+ responseCache = responseCacheManager.getCache(RESPONSE_CACHE_KEY,
String.class, ResponseState.class);
+ } catch (final ReflectiveOperationException ex) {
+ throw (IllegalAccessException) new
IllegalAccessException(ex.getMessage()).initCause(ex);
+ }
}
private URL getConfigFileURL(URL suppliedConfigFileURL) {
