Repository: cxf-fediz Updated Branches: refs/heads/master 79e71b4f7 -> ee3f69576
FEDIZ-179 - Update IdP to Spring Security 3.2 Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/ee3f6957 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/ee3f6957 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/ee3f6957 Branch: refs/heads/master Commit: ee3f695761ffcc232c24f0ffd366d85935b7219e Parents: 79e71b4 Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Nov 14 10:46:59 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Nov 14 10:46:59 2016 +0000 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/applicationContext-security.xml | 2 +- .../src/main/webapp/WEB-INF/applicationContext-security.xml | 2 +- services/idp/pom.xml | 1 - .../main/webapp/WEB-INF/config/security-clientcert-config.xml | 2 +- .../idp/src/main/webapp/WEB-INF/config/security-krb-config.xml | 2 +- .../idp/src/main/webapp/WEB-INF/config/security-rs-config.xml | 2 +- .../idp/src/main/webapp/WEB-INF/config/security-up-config.xml | 2 +- services/idp/src/main/webapp/WEB-INF/security-config.xml | 2 +- .../samlsso/src/test/resources/realmb/security-config.xml | 2 +- .../wsfed/src/test/resources/realmb/security-config.xml | 2 +- systests/jetty9/pom.xml | 6 +++--- 11 files changed, 12 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ee3f6957/examples/jaxrsSpringSecurityWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml ---------------------------------------------------------------------- diff --git a/examples/jaxrsSpringSecurityWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml b/examples/jaxrsSpringSecurityWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml index fd3d4b5..b6e6f60 100644 --- a/examples/jaxrsSpringSecurityWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/examples/jaxrsSpringSecurityWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -26,7 +26,7 @@ xmlns:jaxrs="http://cxf.apache.org/jaxrs"; xsi:schemaLocation=" http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd + http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/util http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ee3f6957/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml ---------------------------------------------------------------------- diff --git a/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml b/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml index 0443ff7..ee7cbbe 100644 --- a/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -25,7 +25,7 @@ xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation=" http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd + http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/util http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ee3f6957/services/idp/pom.xml ---------------------------------------------------------------------- diff --git a/services/idp/pom.xml b/services/idp/pom.xml index 29517cc..d823ad3 100644 --- a/services/idp/pom.xml +++ b/services/idp/pom.xml @@ -31,7 +31,6 @@ <properties> <swagger-ui.version>2.1.0</swagger-ui.version> - <spring.security.version>3.1.7.RELEASE</spring.security.version> </properties> <dependencyManagement> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ee3f6957/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml ---------------------------------------------------------------------- diff --git a/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml b/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml index bc23084..376e38e 100644 --- a/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml +++ b/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml @@ -28,7 +28,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd + http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd "> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ee3f6957/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml ---------------------------------------------------------------------- diff --git a/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml b/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml index d654bcd..b2b500f 100644 --- a/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml +++ b/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml @@ -28,7 +28,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd + http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd "> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ee3f6957/services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml ---------------------------------------------------------------------- diff --git a/services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml b/services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml index 72dcd6a..2ce2033 100644 --- a/services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml +++ b/services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml @@ -28,7 +28,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd + http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd "> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ee3f6957/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml ---------------------------------------------------------------------- diff --git a/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml b/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml index 1fd77ed..97791ca 100644 --- a/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml +++ b/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml @@ -28,7 +28,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd + http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd "> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ee3f6957/services/idp/src/main/webapp/WEB-INF/security-config.xml ---------------------------------------------------------------------- diff --git a/services/idp/src/main/webapp/WEB-INF/security-config.xml b/services/idp/src/main/webapp/WEB-INF/security-config.xml index 373edaf..9a09c14 100644 --- a/services/idp/src/main/webapp/WEB-INF/security-config.xml +++ b/services/idp/src/main/webapp/WEB-INF/security-config.xml @@ -28,7 +28,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd + http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd "> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ee3f6957/systests/federation/samlsso/src/test/resources/realmb/security-config.xml ---------------------------------------------------------------------- diff --git a/systests/federation/samlsso/src/test/resources/realmb/security-config.xml b/systests/federation/samlsso/src/test/resources/realmb/security-config.xml index 6ddfb89..7691dbd 100644 --- a/systests/federation/samlsso/src/test/resources/realmb/security-config.xml +++ b/systests/federation/samlsso/src/test/resources/realmb/security-config.xml @@ -27,7 +27,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd + http://www.springframework.org/schema/security/spring-security-3.2.xsd "> <context:property-placeholder location="classpath:realm.properties"/> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ee3f6957/systests/federation/wsfed/src/test/resources/realmb/security-config.xml ---------------------------------------------------------------------- diff --git a/systests/federation/wsfed/src/test/resources/realmb/security-config.xml b/systests/federation/wsfed/src/test/resources/realmb/security-config.xml index 6ddfb89..7691dbd 100644 --- a/systests/federation/wsfed/src/test/resources/realmb/security-config.xml +++ b/systests/federation/wsfed/src/test/resources/realmb/security-config.xml @@ -27,7 +27,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd + http://www.springframework.org/schema/security/spring-security-3.2.xsd "> <context:property-placeholder location="classpath:realm.properties"/> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ee3f6957/systests/jetty9/pom.xml ---------------------------------------------------------------------- diff --git a/systests/jetty9/pom.xml b/systests/jetty9/pom.xml index ca6dac0..be5dd1e 100644 --- a/systests/jetty9/pom.xml +++ b/systests/jetty9/pom.xml @@ -91,13 +91,13 @@ <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-core</artifactId> - <version>${tomcat7.version}</version> + <version>${tomcat8.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-logging-juli</artifactId> - <version>${tomcat7.version}</version> + <version>${tomcat8.version}</version> <scope>test</scope> </dependency> <dependency> @@ -109,7 +109,7 @@ <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-jasper</artifactId> - <version>${tomcat7.version}</version> + <version>${tomcat8.version}</version> <scope>test</scope> </dependency> <dependency>
