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/05/16 15:12:40 UTC
[cxf-fediz] 01/01: Merge remote-tracking branch 'cxf-fediz/master'
into spring-security-4
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch spring-security-4
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
commit ef4cda62654cc251dc43c3dc0f81f9e2a9b5c7e6
Merge: 5891299 c49cb43
Author: amarkevich <am...@talend.com>
AuthorDate: Thu May 16 18:12:32 2019 +0300
Merge remote-tracking branch 'cxf-fediz/master' into spring-security-4
Conflicts:
pom.xml
services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml
services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml
services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml
.../src/main/webapp/META-INF/context.xml | 2 +-
.../webapp/WEB-INF/applicationContext-security.xml | 10 +-
.../webapp/WEB-INF/applicationContext-security.xml | 20 +-
.../webapp/WEB-INF/applicationContext-security.xml | 17 +-
pom.xml | 12 +-
services/idp-core/pom.xml | 10 -
.../src/main/filters/realm-a/env.properties | 6 -
.../src/main/filters/realm-b/env.properties | 6 -
.../WEB-INF/config/security-clientcert-config.xml | 3 -
.../webapp/WEB-INF/config/security-krb-config.xml | 6 -
.../webapp/WEB-INF/config/security-rs-config.xml | 3 -
.../webapp/WEB-INF/config/security-up-config.xml | 6 -
.../fediz/systests/federation/wsfed/WSFedTest.java | 240 +++++++-------
systests/oidc/pom.xml | 76 ++---
.../cxf/fediz/systests/oidc/AbstractOIDCTest.java | 369 +++++++++++++--------
.../cxf/fediz/systests/oidc/OIDCSpringTest.java | 107 +-----
.../cxf/fediz/systests/oidc/OIDCTomcatTest.java | 111 +------
.../resources/oidc/spring/applicationContext.xml | 4 +-
.../cxf/fediz/systests/common/AbstractTests.java | 18 +-
systests/tomcat/pom.xml | 61 ++--
.../systests/tomcat/AudienceRestrictionTest.java | 132 +-------
.../systests/tomcat/ClientCertificateTest.java | 116 +------
.../cxf/fediz/systests/tomcat/HolderOfKeyTest.java | 134 +-------
.../cxf/fediz/systests/tomcat/TokenExpiryTest.java | 117 +------
.../cxf/fediz/systests/tomcat/TomcatLauncher.java | 135 ++++++++
.../cxf/fediz/systests/tomcat/TomcatTest.java | 117 +------
.../apache/cxf/fediz/systests/tomcat/WReqTest.java | 132 +-------
systests/tomcat/src/test/resources/alice.cer | Bin 873 -> 0 bytes
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../src/main/webapp/WEB-INF/cxf-service.xml | 2 +-
.../webapp/WEB-INF/applicationContext-security.xml | 4 +-
.../webapp/WEB-INF/applicationContext-security.xml | 10 +-
32 files changed, 642 insertions(+), 1348 deletions(-)
diff --cc pom.xml
index ab45fed,cba4170..ec2319f
--- a/pom.xml
+++ b/pom.xml
@@@ -59,14 -59,14 +59,13 @@@
<junit.version>4.12</junit.version>
<kerby.version>1.1.1</kerby.version>
<log4j.version>1.2.17</log4j.version>
- <openjpa.version>2.4.3</openjpa.version>
+ <openjpa.version>3.1.0</openjpa.version>
<servlet.version>2.5</servlet.version>
<slf4j.version>1.7.26</slf4j.version>
- <spring.version>4.3.22.RELEASE</spring.version>
- <spring-ldap-core.version>2.3.2.RELEASE</spring-ldap-core.version>
- <spring.security.version>4.2.11.RELEASE</spring.security.version>
- <spring-webflow.version>2.4.8.RELEASE</spring-webflow.version>
+ <spring.version>4.3.23.RELEASE</spring.version>
- <spring-ldap-core.version>2.3.2.RELEASE</spring-ldap-core.version>
+ <spring.security.version>4.2.12.RELEASE</spring.security.version>
+ <spring-webflow.version>2.5.1.RELEASE</spring-webflow.version>
- <tomcat.version>9.0.19</tomcat.version>
+ <tomcat.version>9.0.20</tomcat.version>
<wss4j.version>2.2.2</wss4j.version>
<tomcat.url>http://localhost:8080/manager/text</tomcat.url>
diff --cc services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml
index ff22a5e,80e77db..5167004
--- 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
@@@ -25,10 -24,8 +24,8 @@@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd
http://www.springframework.org/schema/security
- http://www.springframework.org/schema/security/spring-security-3.2.xsd
+ http://www.springframework.org/schema/security/spring-security.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-4.3.xsd
">
diff --cc services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml
index 3f8a663,98e82a0..df797c0
--- 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
@@@ -23,14 -23,8 +23,8 @@@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd
http://www.springframework.org/schema/security
- http://www.springframework.org/schema/security/spring-security-3.2.xsd
+ http://www.springframework.org/schema/security/spring-security.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd
">
<!-- DISABLE in production as it might log confidential information about the user -->
diff --cc services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml
index 76df962,c01a630..b691ae1
--- 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
@@@ -23,11 -23,8 +23,8 @@@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd
http://www.springframework.org/schema/security
- http://www.springframework.org/schema/security/spring-security-3.2.xsd
+ http://www.springframework.org/schema/security/spring-security.xsd
">
<!-- DISABLE in production as it might log confidential information about the user -->
diff --cc services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml
index a97ccba,458a869..7e4b769
--- 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
@@@ -23,14 -23,8 +23,8 @@@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd
http://www.springframework.org/schema/security
- http://www.springframework.org/schema/security/spring-security-3.2.xsd
+ http://www.springframework.org/schema/security/spring-security.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd
">
<!-- DISABLE in production as it might log confidential information about the user -->