You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/05/17 23:02:30 UTC
cxf git commit: Updating Spring + Spring Security
Repository: cxf
Updated Branches:
refs/heads/master 2538ae42f -> dfc84b0fa
Updating Spring + Spring Security
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dfc84b0f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dfc84b0f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dfc84b0f
Branch: refs/heads/master
Commit: dfc84b0fac84e001069800b32f01529d50339cdb
Parents: 2538ae4
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed May 18 00:01:58 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed May 18 00:02:25 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
.../src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/dfc84b0f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8b270e4..ce1dc37 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -144,9 +144,9 @@
<cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
<cxf.slf4j.version>1.7.21</cxf.slf4j.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
- <cxf.spring.version>4.1.9.RELEASE</cxf.spring.version>
+ <cxf.spring.version>4.2.6.RELEASE</cxf.spring.version>
<cxf.spring.boot.version>1.3.4.RELEASE</cxf.spring.boot.version>
- <cxf.spring.security.version>3.2.9.RELEASE</cxf.spring.security.version>
+ <cxf.spring.security.version>4.1.0.RELEASE</cxf.spring.security.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.ldap.version>1.3.1.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
http://git-wip-us.apache.org/repos/asf/cxf/blob/dfc84b0f/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml
----------------------------------------------------------------------
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 2ac672f..39a5842 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
@@ -52,6 +52,7 @@
<security:global-method-security secured-annotations="disabled" jsr250-annotations="enabled"/>
<security:http auto-config="true">
<security:http-basic/>
+ <security:csrf disabled="true"/>
</security:http>
<security:authentication-manager>
<security:authentication-provider>