This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch spring-5-boot-2
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/spring-5-boot-2 by this push:
new 118f596 ensure all tests passed with spring5
118f596 is described below
commit 118f596a4ffafba83b2712b8204c02066aeea734
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Tue Jun 19 16:14:30 2018 +0800
ensure all tests passed with spring5
---
rt/rs/security/oauth-parent/oauth2/pom.xml | 6 ++++++
rt/rs/security/sso/oidc/pom.xml | 20 +++++++++++++-------
.../test/resources/jaxrs_security/WEB-INF/beans.xml | 2 ++
.../resources/jaxrs_security_cglib/WEB-INF/beans.xml | 7 +++++++
.../jaxrs_security_no_annotations/WEB-INF/beans.xml | 2 ++
5 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml
b/rt/rs/security/oauth-parent/oauth2/pom.xml
index 346ab60..fcacb78 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -184,6 +184,12 @@
<version>1.8.7</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
+ <version>1.0.2.Final</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml
index 7800ede..3bd88d9 100644
--- a/rt/rs/security/sso/oidc/pom.xml
+++ b/rt/rs/security/sso/oidc/pom.xml
@@ -131,13 +131,19 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- </dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
+ <version>1.0.2.Final</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/beans.xml
b/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/beans.xml
index f406f9e..4ba28c9 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/beans.xml
@@ -59,6 +59,7 @@
<bean id="bookstoreGenerics"
class="org.apache.cxf.systest.jaxrs.security.SecureBookStoreGenerics"/>
<security:authentication-manager>
<security:authentication-provider>
+ <security:password-encoder ref="noopEncoder"/>
<security:user-service>
<security:user name="bob" password="bobspassword"
authorities="ROLE_USER"/>
<security:user name="baddy" password="baddyspassword"
authorities="ROLE_USER"/>
@@ -67,5 +68,6 @@
</security:user-service>
</security:authentication-provider>
</security:authentication-manager>
+ <bean id="noopEncoder"
class="org.springframework.security.crypto.password.NoOpPasswordEncoder"/>
</beans>
<!-- END SNIPPET: beans -->
diff --git
a/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml
b/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml
index 3cb7074..2b2fcce 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml
@@ -29,7 +29,9 @@
xmlns:jaxrs="http://cxf.apache.org/jaxrs";
xmlns:aop="http://www.springframework.org/schema/aop";
xmlns:security="http://www.springframework.org/schema/security";
+ xmlns:cxf="http://cxf.apache.org/core";
xsi:schemaLocation="
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd
@@ -40,6 +42,9 @@
<jaxrs:serviceBeans>
<ref bean="bookstore"/>
</jaxrs:serviceBeans>
+ <jaxrs:features>
+ <cxf:logging />
+ </jaxrs:features>
<jaxrs:providers>
<bean
class="org.apache.cxf.systest.jaxrs.security.SecurityExceptionMapper"/>
</jaxrs:providers>
@@ -56,11 +61,13 @@
</security:http>
<security:authentication-manager>
<security:authentication-provider>
+ <security:password-encoder ref="noopEncoder"/>
<security:user-service>
<security:user name="bob" password="bobspassword"
authorities="ROLE_USER"/>
<security:user name="foo" password="bar"
authorities="ROLE_USER, ROLE_ADMIN"/>
</security:user-service>
</security:authentication-provider>
</security:authentication-manager>
+ <bean id="noopEncoder"
class="org.springframework.security.crypto.password.NoOpPasswordEncoder"/>
</beans>
<!-- END SNIPPET: beans -->
diff --git
a/systests/jaxrs/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml
b/systests/jaxrs/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml
index 807f24d..4bdf929 100644
---
a/systests/jaxrs/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml
+++
b/systests/jaxrs/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml
@@ -56,11 +56,13 @@
</security:http>
<security:authentication-manager>
<security:authentication-provider>
+ <security:password-encoder ref="noopEncoder"/>
<security:user-service>
<security:user name="bob" password="bobspassword"
authorities="ROLE_USER"/>
<security:user name="foo" password="bar"
authorities="ROLE_USER, ROLE_ADMIN"/>
</security:user-service>
</security:authentication-provider>
</security:authentication-manager>
+ <bean id="noopEncoder"
class="org.springframework.security.crypto.password.NoOpPasswordEncoder"/>
</beans>
<!-- END SNIPPET: beans -->
