Skip to content

Commit 166f4b3

Browse files
dependabot[bot]reta
dependabot[bot]
and
reta
authored
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](ehcache/ehcache3@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](ehcache/ehcache3@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] <support@github.com> * Address changes on EHCache APIs exception signatures --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andriy Redko <drreta@gmail.com>
1 parent 1b5d9a5 commit 166f4b3

File tree

3 files changed

+50
-39
lines changed

3 files changed

+50
-39
lines changed

‎parent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<cxf.dropwizard3.version>3.2.6</cxf.dropwizard3.version>
114114
<cxf.dropwizard4.version>4.2.38</cxf.dropwizard4.version>
115115
<cxf.dropwizard5.version>5.0.6</cxf.dropwizard5.version>
116-
<cxf.ehcache3.version>3.11.1</cxf.ehcache3.version>
116+
<cxf.ehcache3.version>3.12.0</cxf.ehcache3.version>
117117
<cxf.el-api.version>6.0.1</cxf.el-api.version>
118118
<cxf.jvnet.jaxb.version>4.0.12</cxf.jvnet.jaxb.version>
119119
<cxf.geronimo.jta.version>1.1.1</cxf.geronimo.jta.version>

‎rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,23 @@ public EHCacheTokenReplayCache(String configFile, Bus bus)
8282
// ignore
8383
}
8484

85-
XmlConfiguration xmlConfig = new XmlConfiguration(getConfigFileURL(configFileURL));
86-
CacheConfigurationBuilder<String, EHCacheValue> configurationBuilder =
87-
xmlConfig.newCacheConfigurationBuilderFromTemplate(CACHE_KEY,
88-
String.class, EHCacheValue.class);
89-
// Note, we don't require strong random values here
90-
String diskKey = CACHE_KEY + "-" + Math.abs(new Random().nextInt());
91-
cacheManager = CacheManagerBuilder.newCacheManagerBuilder().withCache(CACHE_KEY, configurationBuilder)
92-
.with(CacheManagerBuilder.persistence(new File(System.getProperty("java.io.tmpdir"), diskKey))).build();
93-
94-
cacheManager.init();
95-
cache = cacheManager.getCache(CACHE_KEY, String.class, EHCacheValue.class);
96-
85+
try {
86+
XmlConfiguration xmlConfig = new XmlConfiguration(getConfigFileURL(configFileURL));
87+
CacheConfigurationBuilder<String, EHCacheValue> configurationBuilder =
88+
xmlConfig.newCacheConfigurationBuilderFromTemplate(CACHE_KEY,
89+
String.class, EHCacheValue.class);
90+
// Note, we don't require strong random values here
91+
String diskKey = CACHE_KEY + "-" + Math.abs(new Random().nextInt());
92+
cacheManager = CacheManagerBuilder.newCacheManagerBuilder()
93+
.withCache(CACHE_KEY, configurationBuilder)
94+
.with(CacheManagerBuilder.persistence(new File(System.getProperty("java.io.tmpdir"), diskKey)))
95+
.build();
96+
97+
cacheManager.init();
98+
cache = cacheManager.getCache(CACHE_KEY, String.class, EHCacheValue.class);
99+
} catch (final ReflectiveOperationException ex) {
100+
throw (IllegalAccessException) new IllegalAccessException(ex.getMessage()).initCause(ex);
101+
}
97102
}
98103

99104
private URL getConfigFileURL(URL suppliedConfigFileURL) {

‎rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -79,32 +79,38 @@ public EHCacheSPStateManager(String configFile, Bus bus)
7979
// ignore
8080
}
8181

82-
XmlConfiguration xmlConfig = new XmlConfiguration(getConfigFileURL(configFileURL));
83-
CacheConfigurationBuilder<String, RequestState> requestConfigurationBuilder =
84-
xmlConfig.newCacheConfigurationBuilderFromTemplate(REQUEST_CACHE_KEY,
85-
String.class, RequestState.class);
86-
87-
// Note, we don't require strong random values here
88-
String diskKey = REQUEST_CACHE_KEY + "-" + Math.abs(new Random().nextInt());
89-
requestCacheManager = CacheManagerBuilder.newCacheManagerBuilder()
90-
.withCache(REQUEST_CACHE_KEY, requestConfigurationBuilder)
91-
.with(CacheManagerBuilder.persistence(new File(System.getProperty("java.io.tmpdir"), diskKey))).build();
92-
93-
requestCacheManager.init();
94-
requestCache = requestCacheManager.getCache(REQUEST_CACHE_KEY, String.class, RequestState.class);
95-
96-
CacheConfigurationBuilder<String, ResponseState> responseConfigurationBuilder =
97-
xmlConfig.newCacheConfigurationBuilderFromTemplate(RESPONSE_CACHE_KEY,
98-
String.class, ResponseState.class);
99-
100-
// Note, we don't require strong random values here
101-
diskKey = RESPONSE_CACHE_KEY + "-" + Math.abs(new Random().nextInt());
102-
responseCacheManager = CacheManagerBuilder.newCacheManagerBuilder()
103-
.withCache(RESPONSE_CACHE_KEY, responseConfigurationBuilder)
104-
.with(CacheManagerBuilder.persistence(new File(System.getProperty("java.io.tmpdir"), diskKey))).build();
105-
106-
responseCacheManager.init();
107-
responseCache = responseCacheManager.getCache(RESPONSE_CACHE_KEY, String.class, ResponseState.class);
82+
try {
83+
XmlConfiguration xmlConfig = new XmlConfiguration(getConfigFileURL(configFileURL));
84+
CacheConfigurationBuilder<String, RequestState> requestConfigurationBuilder =
85+
xmlConfig.newCacheConfigurationBuilderFromTemplate(REQUEST_CACHE_KEY,
86+
String.class, RequestState.class);
87+
88+
// Note, we don't require strong random values here
89+
String diskKey = REQUEST_CACHE_KEY + "-" + Math.abs(new Random().nextInt());
90+
requestCacheManager = CacheManagerBuilder.newCacheManagerBuilder()
91+
.withCache(REQUEST_CACHE_KEY, requestConfigurationBuilder)
92+
.with(CacheManagerBuilder.persistence(new File(System.getProperty("java.io.tmpdir"), diskKey)))
93+
.build();
94+
95+
requestCacheManager.init();
96+
requestCache = requestCacheManager.getCache(REQUEST_CACHE_KEY, String.class, RequestState.class);
97+
98+
CacheConfigurationBuilder<String, ResponseState> responseConfigurationBuilder =
99+
xmlConfig.newCacheConfigurationBuilderFromTemplate(RESPONSE_CACHE_KEY,
100+
String.class, ResponseState.class);
101+
102+
// Note, we don't require strong random values here
103+
diskKey = RESPONSE_CACHE_KEY + "-" + Math.abs(new Random().nextInt());
104+
responseCacheManager = CacheManagerBuilder.newCacheManagerBuilder()
105+
.withCache(RESPONSE_CACHE_KEY, responseConfigurationBuilder)
106+
.with(CacheManagerBuilder.persistence(new File(System.getProperty("java.io.tmpdir"), diskKey)))
107+
.build();
108+
109+
responseCacheManager.init();
110+
responseCache = responseCacheManager.getCache(RESPONSE_CACHE_KEY, String.class, ResponseState.class);
111+
} catch (final ReflectiveOperationException ex) {
112+
throw (IllegalAccessException) new IllegalAccessException(ex.getMessage()).initCause(ex);
113+
}
108114
}
109115

110116
private URL getConfigFileURL(URL suppliedConfigFileURL) {

0 commit comments

Comments
 (0)