You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2019/06/14 11:27:27 UTC
[cxf-fediz] branch master updated: Upgrade CXF to 3.3.x
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 <bu...@gmail.com>
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 @@
</plugin>
</plugins>
</build>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.releases</id>
+ <url>https://repository.apache.org/content/repositories/releases/</url>
+ <name>Apache Releases Repo</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
</project>
diff --git a/pom.xml b/pom.xml
index 2a3695b..4f437c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,11 +43,13 @@
<commons.logging.version>1.2</commons.logging.version>
<commons.text.version>1.6</commons.text.version>
<commons.validator.version>1.6</commons.validator.version>
- <cxf.version>3.2.9</cxf.version>
+ <cxf.version>3.3.2</cxf.version>
<cxf.build-utils.version>3.4.1</cxf.build-utils.version>
<dbcp.version>2.1.1</dbcp.version>
<easymock.version>4.0.2</easymock.version>
<ehcache.version>2.10.6</ehcache.version>
+ <ehcache3.version>3.0.3</ehcache3.version>
+ <jcache.version>1.0.0</jcache.version>
<hsqldb.version>2.4.1</hsqldb.version>
<htmlunit.version>2.27</htmlunit.version>
<jackson.version>2.9.9</jackson.version>
@@ -134,6 +136,17 @@
</releases>
</repository>
<repository>
+ <id>apache.staging</id>
+ <url>https://repository.apache.org/content/groups/staging/</url>
+ <name>Apache Snapshot Repo</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
<id>wasdev-maven-repo</id>
<name>wasdev-maven-repo</name>
<url>https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/maven/repository/</url>
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 @@
<artifactId>fediz-core</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <!-- TODO Remove when we pick up WSS4J 2.3.0-SNAPSHOT -->
+ <exclusions>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -53,6 +60,16 @@
<version>${cxf.version}</version>
</dependency>
<dependency>
+ <groupId>javax.cache</groupId>
+ <artifactId>cache-api</artifactId>
+ <version>${jcache.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>${ehcache3.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>${cxf.version}</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<String> 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<String> 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 100644
--- 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
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.fediz.service.sts;
-import java.net.URI;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -36,7 +35,7 @@ import org.apache.cxf.sts.claims.ProcessedClaimCollection;
public class FileClaimsHandler implements ClaimsHandler {
private Map<String, Map<String, String>> userClaims;
- private List<URI> supportedClaims;
+ private List<String> supportedClaims;
public void setUserClaims(Map<String, Map<String, String>> userClaims) {
this.userClaims = userClaims;
@@ -46,12 +45,12 @@ public class FileClaimsHandler implements ClaimsHandler {
return userClaims;
}
- public void setSupportedClaims(List<URI> supportedClaims) {
+ public void setSupportedClaims(List<String> supportedClaims) {
this.supportedClaims = supportedClaims;
}
@Override
- public List<URI> getSupportedClaimTypes() {
+ public List<String> getSupportedClaimTypes() {
return Collections.unmodifiableList(this.supportedClaims);
}
diff --git a/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/realms/RealmFileClaimsHandler.java b/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/realms/RealmFileClaimsHandler.java
index 4e64795..70b2eeb 100644
--- a/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/realms/RealmFileClaimsHandler.java
+++ b/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/realms/RealmFileClaimsHandler.java
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.fediz.service.sts.realms;
-import java.net.URI;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -40,7 +39,7 @@ public class RealmFileClaimsHandler implements ClaimsHandler {
private static final Logger LOG = LogUtils.getL7dLogger(RealmFileClaimsHandler.class);
private Map<String, Map<String, String>> userClaims;
- private List<URI> supportedClaims;
+ private List<String> supportedClaims;
private String realm;
public void setUserClaims(Map<String, Map<String, String>> userClaims) {
@@ -51,7 +50,7 @@ public class RealmFileClaimsHandler implements ClaimsHandler {
return userClaims;
}
- public void setSupportedClaims(List<URI> supportedClaims) {
+ public void setSupportedClaims(List<String> supportedClaims) {
this.supportedClaims = supportedClaims;
}
@@ -64,7 +63,7 @@ public class RealmFileClaimsHandler implements ClaimsHandler {
}
@Override
- public List<URI> getSupportedClaimTypes() {
+ public List<String> getSupportedClaimTypes() {
return Collections.unmodifiableList(this.supportedClaims);
}
diff --git a/systests/custom/src/test/java/custom/CustomClaimsHandler.java b/systests/custom/src/test/java/custom/CustomClaimsHandler.java
index f308682..e5abff7 100644
--- a/systests/custom/src/test/java/custom/CustomClaimsHandler.java
+++ b/systests/custom/src/test/java/custom/CustomClaimsHandler.java
@@ -18,7 +18,6 @@
*/
package custom;
-import java.net.URI;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -43,7 +42,7 @@ public class CustomClaimsHandler implements ClaimsHandler {
private static final Logger LOG = LogUtils.getL7dLogger(CustomClaimsHandler.class);
private Map<String, Map<String, String>> userClaims;
- private List<URI> supportedClaims;
+ private List<String> supportedClaims;
private String realm;
public void setUserClaims(Map<String, Map<String, String>> userClaims) {
@@ -54,7 +53,7 @@ public class CustomClaimsHandler implements ClaimsHandler {
return userClaims;
}
- public void setSupportedClaims(List<URI> supportedClaims) {
+ public void setSupportedClaims(List<String> supportedClaims) {
this.supportedClaims = supportedClaims;
}
@@ -67,7 +66,7 @@ public class CustomClaimsHandler implements ClaimsHandler {
}
@Override
- public List<URI> getSupportedClaimTypes() {
+ public List<String> getSupportedClaimTypes() {
return Collections.unmodifiableList(this.supportedClaims);
}
diff --git a/systests/federation/oidcIdpWebapp/pom.xml b/systests/federation/oidcIdpWebapp/pom.xml
index d6b4f33..2b84b40 100644
--- a/systests/federation/oidcIdpWebapp/pom.xml
+++ b/systests/federation/oidcIdpWebapp/pom.xml
@@ -45,16 +45,26 @@
<version>${commons.lang.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-security-sso-oidc</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-security-sso-oidc</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.cache</groupId>
+ <artifactId>cache-api</artifactId>
+ <version>${jcache.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>${ehcache3.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
diff --git a/systests/federation/oidcIdpWebapp/src/main/java/org/apache/cxf/fediz/oidc/idp/example/EHCacheOIDCTokenProvider.java b/systests/federation/oidcIdpWebapp/src/main/java/org/apache/cxf/fediz/oidc/idp/example/EHCacheOIDCTokenProvider.java
index bb05f21..867376d 100644
--- a/systests/federation/oidcIdpWebapp/src/main/java/org/apache/cxf/fediz/oidc/idp/example/EHCacheOIDCTokenProvider.java
+++ b/systests/federation/oidcIdpWebapp/src/main/java/org/apache/cxf/fediz/oidc/idp/example/EHCacheOIDCTokenProvider.java
@@ -24,13 +24,17 @@ import java.util.List;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.OAuthPermission;
-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;
/**
- * Extend the DefaultEHCacheCodeDataProvider to allow OpenId
+ * Extend the JCacheCodeDataProvider to allow OpenId
*/
-public class EHCacheOIDCTokenProvider extends DefaultEHCacheCodeDataProvider {
+public class EHCacheOIDCTokenProvider extends JCacheCodeDataProvider {
+
+ public EHCacheOIDCTokenProvider() throws Exception {
+ super();
+ }
@Override
public List<OAuthPermission> convertScopeToPermissions(Client client, List<String> requestedScopes) {