This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
The following commit(s) were added to refs/heads/master by this push:
new 3c967e4 Upgrade CXF to 3.3.x
3c967e4 is described below
commit 3c967e4b97da15a1550403c552c233b984cb6d85
Author: Alexey Markevich
AuthorDate: Wed Apr 24 17:47:04 2019 +0300
Upgrade CXF to 3.3.x
---
examples/wsclientWebapp/webservice/common/pom.xml | 13 ++
pom.xml| 15 ++-
services/oidc/pom.xml | 17
.../fediz/service/oidc/OAuthDataProviderImpl.java | 8 --
.../cxf/fediz/service/sts/FileClaimsHandler.java | 7 +++--
.../service/sts/realms/RealmFileClaimsHandler.java | 7 +++--
.../src/test/java/custom/CustomClaimsHandler.java | 7 +++--
systests/federation/oidcIdpWebapp/pom.xml | 30 ++
.../oidc/idp/example/EHCacheOIDCTokenProvider.java | 10 +---
9 files changed, 86 insertions(+), 28 deletions(-)
diff --git a/examples/wsclientWebapp/webservice/common/pom.xml
b/examples/wsclientWebapp/webservice/common/pom.xml
index 7876a05..24e46b3 100644
--- a/examples/wsclientWebapp/webservice/common/pom.xml
+++ b/examples/wsclientWebapp/webservice/common/pom.xml
@@ -56,4 +56,17 @@
+
+
+apache.releases
+
https://repository.apache.org/content/repositories/releases/
+Apache Releases Repo
+
+false
+
+
+true
+
+
+
diff --git a/pom.xml b/pom.xml
index 2a3695b..4f437c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,11 +43,13 @@
1.2
1.6
1.6
-3.2.9
+3.3.2
3.4.1
2.1.1
4.0.2
2.10.6
+3.0.3
+1.0.0
2.4.1
2.27
2.9.9
@@ -134,6 +136,17 @@
+apache.staging
+https://repository.apache.org/content/groups/staging/
+Apache Snapshot Repo
+
+false
+
+
+true
+
+
+
wasdev-maven-repo
wasdev-maven-repo
https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/maven/repository/
diff --git a/services/oidc/pom.xml b/services/oidc/pom.xml
index 6c5681a..166089b 100644
--- a/services/oidc/pom.xml
+++ b/services/oidc/pom.xml
@@ -46,6 +46,13 @@
fediz-core
${project.version}
provided
+
+
+
+net.sf.ehcache
+ehcache
+
+
org.apache.cxf
@@ -53,6 +60,16 @@
${cxf.version}
+javax.cache
+cache-api
+${jcache.version}
+
+
+org.ehcache
+ehcache
+${ehcache3.version}
+
+
org.apache.cxf
cxf-rt-rs-extension-providers
${cxf.version}
diff --git
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/OAuthDataProviderImpl.java
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/OAuthDataProviderImpl.java
index d24a5bf..909634d 100644
---
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/OAuthDataProviderImpl.java
+++
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/OAuthDataProviderImpl.java
@@ -24,16 +24,20 @@ import java.util.List;
import java.util.Set;
import org.apache.cxf.rs.security.oauth2.common.Client;
-import
org.apache.cxf.rs.security.oauth2.grants.code.DefaultEHCacheCodeDataProvider;
+import org.apache.cxf.rs.security.oauth2.grants.code.JCacheCodeDataProvider;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.apache.cxf.rs.security.oidc.utils.OidcUtils;
-public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
+public class OAuthDataProviderImpl extends JCacheCodeDataProvider {
private static final Set NON_REDIRECTION_FLOWS =
new HashSet<>(Arrays.asList(OAuthConstants.CLIENT_CREDENTIALS_GRANT,
OAuthConstants.RESOURCE_OWNER_GRANT));
+public OAuthDataProviderImpl() throws Exception {
+super();
+}
+
@Override
protected void checkRequestedScopes(Client client, List
requestedScopes) {
String grantType = super.getCurrentRequestedGrantType();
diff --git
a/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/FileClaimsHandler.java
b/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/FileClaimsHandler.java
index b6392b2..844d6d3
