Author: rmannibucau
Date: Fri Jan 25 06:02:59 2019
New Revision: 1852095
URL: http://svn.apache.org/viewvc?rev=1852095&view=rev
Log:
MEECROWAVE-178 cxf 3.3.0 upgrade
Modified:
openwebbeans/meecrowave/trunk/meecrowave-core/pom.xml
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
openwebbeans/meecrowave/trunk/pom.xml
Modified: openwebbeans/meecrowave/trunk/meecrowave-core/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/pom.xml?rev=1852095&r1=1852094&r2=1852095&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-core/pom.xml (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-core/pom.xml Fri Jan 25 06:02:59
2019
@@ -90,12 +90,20 @@
<version>${cxf.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.woodstox</groupId>
Modified:
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java?rev=1852095&r1=1852094&r2=1852095&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
Fri Jan 25 06:02:59 2019
@@ -44,7 +44,6 @@ import org.apache.cxf.rs.security.oauth2
import
org.apache.cxf.rs.security.oauth2.grants.refresh.RefreshTokenGrantHandler;
import org.apache.cxf.rs.security.oauth2.provider.AbstractOAuthDataProvider;
import org.apache.cxf.rs.security.oauth2.provider.AccessTokenGrantHandler;
-import
org.apache.cxf.rs.security.oauth2.provider.DefaultEHCacheOAuthDataProvider;
import
org.apache.cxf.rs.security.oauth2.provider.DefaultEncryptingOAuthDataProvider;
import org.apache.cxf.rs.security.oauth2.provider.JCacheOAuthDataProvider;
import org.apache.cxf.rs.security.oauth2.provider.JPAOAuthDataProvider;
@@ -144,9 +143,6 @@ public class OAuth2Configurer {
throw new IllegalStateException(e);
}
break;
- case "ehcache": // not sure it makes sense since we have jcache
but this one is cheap to support
- provider = new
DefaultEHCacheOAuthDataProvider(configuration.getJcacheConfigUri(), bus);
- break;
case "encrypted":
if (!configuration.isAuthorizationCodeSupport()) { // else use
code impl
provider = new DefaultEncryptingOAuthDataProvider(
Modified: openwebbeans/meecrowave/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/pom.xml?rev=1852095&r1=1852094&r2=1852095&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/pom.xml (original)
+++ openwebbeans/meecrowave/trunk/pom.xml Fri Jan 25 06:02:59 2019
@@ -52,7 +52,7 @@
<junit.version>4.12</junit.version>
<tomcat.version>9.0.14</tomcat.version>
<openwebbeans.version>2.0.10</openwebbeans.version>
- <cxf.version>3.2.7</cxf.version>
+ <cxf.version>3.3.0</cxf.version>
<johnzon.version>1.1.10</johnzon.version>
<log4j2.version>2.11.1</log4j2.version>
<deltaspike.version>1.8.2</deltaspike.version>
@@ -215,6 +215,12 @@
</profile>
</profiles>
+ <repositories>
+ <repository>
+ <id>cxf-staging</id>
+
<url>https://repository.apache.org/content/repositories/orgapachecxf-1133/</url>
+ </repository>
+ </repositories>
<!-- only needed when under development
<repositories>
<repository>
