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 2021/02/17 06:45:20 UTC
[cxf-fediz] branch cxf340 updated (8218994 -> 63133bb)
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a change to branch cxf340
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git.
from 8218994 initial upgrade to CXF 3.4.0 & WSS4J 2.3.0
add 4c7598f update builds URL
add 4ed6e76 Updating Spring to 4.3.29
add 7bb6cfa Updating Tomcat to 9.0.38
add 6c326e7 Add signInQuery callback to SAML SSO
add 9a1af28 Merge pull request #61 from pedromfalves/FEDIZ-252
add 2db1ba2 FEDIZ-252 - Adding tests
add cc9d860 Updating Jackson to 2.10.5
add c25ca4e Updating Spring security to 4.2.19
add b165593 Updating Tomcat to 9.0.39
add fa02972 Updating junit to 4.13.1
add f360b65 Updating Jetty to 9.4.32 + fixing tests
add 427f962 Updating Jetty to 9.4.33
add 213b0b7 systests: throw exception on server starup failure
add 5b9c6dd Update htmlunit to 2.44.0
add b6ec2f4 Update commons-dbcp2 to 2.8.0
add 258ca61 Updating to CXF 3.3.8
add 1459c9e Updating Tomcat to 9.0.40
add 7ae1ef4 Updating Checkstyle to 8.37
add ea5a5ef Updating keys
add f5a2c78 [maven-release-plugin] prepare release fediz-1.5.1
add 4594a5e [maven-release-plugin] prepare for next development iteration
add 0b4edca Updating release notes
add 6279cc2 Updating Tomcat to 9.0.41
add 6508ab5 Updating Jetty to 9.4.35.v20201120 + Spring to 4.3.30.RELEASE
add 8abc376 Updating to WSS4J 2.2.6
add 1fb2a78 Updating CXF to 3.3.9
add 4867255 Updating war-plugin to 3.3.1
add 1dac649 FEDIZ-253 - Enforce that only http or https is allowed in the OIDC ClientRegistration page
add 37cc50b Update to Jetty 9.4.36.v20210114
add b731846 Updating certs
add 105eee8 Updating Tomcat to 9.0.43
new 63133bb Merge remote-tracking branch 'cxf-fediz/master' into cxf340
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 2 +-
apache-fediz/pom.xml | 4 +-
examples/jaxrsCxfPluginWebapp/pom.xml | 2 +-
.../src/main/resources/ststrust.jks | Bin 3005 -> 3005 bytes
examples/jaxrsSimpleWebapp/pom.xml | 2 +-
.../src/main/resources/ststrust.jks | Bin 3005 -> 3005 bytes
examples/jaxrsSpringSecurityWebapp/pom.xml | 2 +-
.../src/main/resources/ststrust.jks | Bin 3005 -> 3005 bytes
examples/pom.xml | 2 +-
examples/samplekeys/idp-ssl-key.jks | Bin 2072 -> 2071 bytes
examples/samplekeys/idp-ssl-trust.jks | Bin 783 -> 783 bytes
examples/samplekeys/rp-ssl-key.jks | Bin 2071 -> 2071 bytes
examples/samplekeys/ststrust.jks | Bin 3005 -> 3005 bytes
examples/samplekeys/wsp-ssl-key.jks | Bin 2071 -> 2073 bytes
examples/simpleWebapp/pom.xml | 2 +-
examples/springPreauthWebapp/pom.xml | 2 +-
examples/springWebapp/pom.xml | 2 +-
.../springWebapp/src/main/resources/ststrust.jks | Bin 3005 -> 3005 bytes
examples/wsclientWebapp/pom.xml | 2 +-
examples/wsclientWebapp/webapp/pom.xml | 2 +-
.../webapp/src/main/resources/rp-ssl-key.jks | Bin 2071 -> 2071 bytes
.../webapp/src/main/resources/webappKeystore.jks | Bin 1534 -> 1534 bytes
examples/wsclientWebapp/webservice/common/pom.xml | 2 +-
examples/wsclientWebapp/webservice/pom.xml | 2 +-
examples/wsclientWebapp/webservice/service/pom.xml | 2 +-
.../service/src/main/resources/ststrust.jks | Bin 3005 -> 3005 bytes
plugins/core/pom.xml | 2 +-
.../cxf/fediz/core/config/FederationProtocol.java | 22 ---
.../org/apache/cxf/fediz/core/config/Protocol.java | 22 +++
.../core/processor/AbstractFedizProcessor.java | 33 +++++
.../core/processor/FederationProcessorImpl.java | 32 -----
.../fediz/core/processor/SAMLProcessorImpl.java | 7 +
.../src/main/resources/schemas/FedizConfig.xsd | 2 +-
.../cxf/fediz/core/config/CallbackHandlerTest.java | 35 +++--
plugins/core/src/test/resources/clientstore.jks | Bin 4436 -> 4559 bytes
plugins/core/src/test/resources/stsstore.jks | Bin 4717 -> 4557 bytes
plugins/core/src/test/resources/ststrust.jks | Bin 4943 -> 4953 bytes
plugins/cxf/pom.xml | 2 +-
plugins/jetty9/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/tomcat/pom.xml | 2 +-
pom.xml | 26 ++--
release_notes.txt | 8 ++
services/idp-core/pom.xml | 2 +-
services/idp/pom.xml | 11 +-
services/idp/src/main/resources/idp-ssl-key.jks | Bin 2072 -> 2071 bytes
services/idp/src/main/resources/idp-ssl-trust.jks | Bin 783 -> 783 bytes
services/idp/src/test/resources/idp-ssl-key.jks | Bin 0 -> 2071 bytes
.../idp/src/test/resources/jetty-ssl-context.xml | 4 +-
services/oidc/pom.xml | 2 +-
.../oidc/clients/ClientRegistrationService.java | 9 +-
services/pom.xml | 2 +-
services/sts/pom.xml | 2 +-
services/sts/src/main/resources/ststrust.jks | Bin 3908 -> 3908 bytes
.../sts/src/test/resources/jetty-ssl-context.xml | 4 +-
systests/custom/pom.xml | 2 +-
systests/cxf/pom.xml | 2 +-
.../cxf/fediz/systests/cxf/FederationTest.java | 159 ++++++++++-----------
.../cxf/fediz/systests/cxf/TokenExpiryTest.java | 158 ++++++++++----------
systests/federation/oidcIdpWebapp/pom.xml | 2 +-
systests/federation/pom.xml | 2 +-
systests/federation/samlIdpWebapp/pom.xml | 2 +-
systests/federation/samlWebapp/pom.xml | 2 +-
.../samlWebapp/src/main/resources/ststrust.jks | Bin 3005 -> 3005 bytes
systests/federation/samlsso/pom.xml | 2 +-
systests/federation/unknown-subject/pom.xml | 2 +-
systests/federation/wsfed/pom.xml | 2 +-
.../fediz/systests/federation/wsfed/WSFedTest.java | 5 +-
systests/idp/pom.xml | 2 +-
.../org/apache/cxf/fediz/systests/idp/IdpTest.java | 50 +++----
systests/jetty9/pom.xml | 2 +-
systests/kerberos/pom.xml | 2 +-
systests/ldap/pom.xml | 2 +-
systests/oidc/pom.xml | 2 +-
systests/pom.xml | 2 +-
systests/samlsso/pom.xml | 2 +-
systests/spring/pom.xml | 2 +-
systests/tests/pom.xml | 2 +-
systests/tests/src/test/resources/server.jks | Bin 4467 -> 4466 bytes
systests/tomcat/pom.xml | 2 +-
systests/webapps/cxfWebapp/pom.xml | 2 +-
systests/webapps/pom.xml | 2 +-
systests/webapps/simpleWebapp/pom.xml | 2 +-
systests/webapps/springPreauthWebapp/pom.xml | 2 +-
systests/webapps/springWebapp/pom.xml | 2 +-
86 files changed, 347 insertions(+), 338 deletions(-)
create mode 100644 services/idp/src/test/resources/idp-ssl-key.jks
[cxf-fediz] 01/01: Merge remote-tracking branch 'cxf-fediz/master'
into cxf340
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch cxf340
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
commit 63133bb3a4932108132a0769ef7f3f48d183317a
Merge: 8218994 105eee8
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Wed Feb 17 09:45:11 2021 +0300
Merge remote-tracking branch 'cxf-fediz/master' into cxf340
Conflicts:
pom.xml
README.md | 2 +-
apache-fediz/pom.xml | 4 +-
examples/jaxrsCxfPluginWebapp/pom.xml | 2 +-
.../src/main/resources/ststrust.jks | Bin 3005 -> 3005 bytes
examples/jaxrsSimpleWebapp/pom.xml | 2 +-
.../src/main/resources/ststrust.jks | Bin 3005 -> 3005 bytes
examples/jaxrsSpringSecurityWebapp/pom.xml | 2 +-
.../src/main/resources/ststrust.jks | Bin 3005 -> 3005 bytes
examples/pom.xml | 2 +-
examples/samplekeys/idp-ssl-key.jks | Bin 2072 -> 2071 bytes
examples/samplekeys/idp-ssl-trust.jks | Bin 783 -> 783 bytes
examples/samplekeys/rp-ssl-key.jks | Bin 2071 -> 2071 bytes
examples/samplekeys/ststrust.jks | Bin 3005 -> 3005 bytes
examples/samplekeys/wsp-ssl-key.jks | Bin 2071 -> 2073 bytes
examples/simpleWebapp/pom.xml | 2 +-
examples/springPreauthWebapp/pom.xml | 2 +-
examples/springWebapp/pom.xml | 2 +-
.../springWebapp/src/main/resources/ststrust.jks | Bin 3005 -> 3005 bytes
examples/wsclientWebapp/pom.xml | 2 +-
examples/wsclientWebapp/webapp/pom.xml | 2 +-
.../webapp/src/main/resources/rp-ssl-key.jks | Bin 2071 -> 2071 bytes
.../webapp/src/main/resources/webappKeystore.jks | Bin 1534 -> 1534 bytes
examples/wsclientWebapp/webservice/common/pom.xml | 2 +-
examples/wsclientWebapp/webservice/pom.xml | 2 +-
examples/wsclientWebapp/webservice/service/pom.xml | 2 +-
.../service/src/main/resources/ststrust.jks | Bin 3005 -> 3005 bytes
plugins/core/pom.xml | 2 +-
.../cxf/fediz/core/config/FederationProtocol.java | 22 ---
.../org/apache/cxf/fediz/core/config/Protocol.java | 22 +++
.../core/processor/AbstractFedizProcessor.java | 33 +++++
.../core/processor/FederationProcessorImpl.java | 32 -----
.../fediz/core/processor/SAMLProcessorImpl.java | 7 +
.../src/main/resources/schemas/FedizConfig.xsd | 2 +-
.../cxf/fediz/core/config/CallbackHandlerTest.java | 35 +++--
plugins/core/src/test/resources/clientstore.jks | Bin 4436 -> 4559 bytes
plugins/core/src/test/resources/stsstore.jks | Bin 4717 -> 4557 bytes
plugins/core/src/test/resources/ststrust.jks | Bin 4943 -> 4953 bytes
plugins/cxf/pom.xml | 2 +-
plugins/jetty9/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/tomcat/pom.xml | 2 +-
pom.xml | 26 ++--
release_notes.txt | 8 ++
services/idp-core/pom.xml | 2 +-
services/idp/pom.xml | 11 +-
services/idp/src/main/resources/idp-ssl-key.jks | Bin 2072 -> 2071 bytes
services/idp/src/main/resources/idp-ssl-trust.jks | Bin 783 -> 783 bytes
services/idp/src/test/resources/idp-ssl-key.jks | Bin 0 -> 2071 bytes
.../idp/src/test/resources/jetty-ssl-context.xml | 4 +-
services/oidc/pom.xml | 2 +-
.../oidc/clients/ClientRegistrationService.java | 9 +-
services/pom.xml | 2 +-
services/sts/pom.xml | 2 +-
services/sts/src/main/resources/ststrust.jks | Bin 3908 -> 3908 bytes
.../sts/src/test/resources/jetty-ssl-context.xml | 4 +-
systests/custom/pom.xml | 2 +-
systests/cxf/pom.xml | 2 +-
.../cxf/fediz/systests/cxf/FederationTest.java | 159 ++++++++++-----------
.../cxf/fediz/systests/cxf/TokenExpiryTest.java | 158 ++++++++++----------
systests/federation/oidcIdpWebapp/pom.xml | 2 +-
systests/federation/pom.xml | 2 +-
systests/federation/samlIdpWebapp/pom.xml | 2 +-
systests/federation/samlWebapp/pom.xml | 2 +-
.../samlWebapp/src/main/resources/ststrust.jks | Bin 3005 -> 3005 bytes
systests/federation/samlsso/pom.xml | 2 +-
systests/federation/unknown-subject/pom.xml | 2 +-
systests/federation/wsfed/pom.xml | 2 +-
.../fediz/systests/federation/wsfed/WSFedTest.java | 5 +-
systests/idp/pom.xml | 2 +-
.../org/apache/cxf/fediz/systests/idp/IdpTest.java | 50 +++----
systests/jetty9/pom.xml | 2 +-
systests/kerberos/pom.xml | 2 +-
systests/ldap/pom.xml | 2 +-
systests/oidc/pom.xml | 2 +-
systests/pom.xml | 2 +-
systests/samlsso/pom.xml | 2 +-
systests/spring/pom.xml | 2 +-
systests/tests/pom.xml | 2 +-
systests/tests/src/test/resources/server.jks | Bin 4467 -> 4466 bytes
systests/tomcat/pom.xml | 2 +-
systests/webapps/cxfWebapp/pom.xml | 2 +-
systests/webapps/pom.xml | 2 +-
systests/webapps/simpleWebapp/pom.xml | 2 +-
systests/webapps/springPreauthWebapp/pom.xml | 2 +-
systests/webapps/springWebapp/pom.xml | 2 +-
86 files changed, 347 insertions(+), 338 deletions(-)
diff --cc pom.xml
index b653d72,4babb9f..07310af
--- a/pom.xml
+++ b/pom.xml
@@@ -43,30 -43,30 +43,30 @@@
<commons.logging.version>1.2</commons.logging.version>
<commons.text.version>1.9</commons.text.version>
<commons.validator.version>1.7</commons.validator.version>
- <cxf.version>3.4.0</cxf.version>
- <cxf.version>3.3.9</cxf.version>
++ <cxf.version>3.4.2</cxf.version>
<cxf.build-utils.version>3.4.4</cxf.build-utils.version>
<easymock.version>4.0.2</easymock.version>
<ehcache.version>2.10.6</ehcache.version>
<ehcache3.version>3.8.1</ehcache3.version>
<jcache.version>1.0.0</jcache.version>
<hsqldb.version>2.5.1</hsqldb.version>
- <htmlunit.version>2.43.0</htmlunit.version>
- <jackson.version>2.10.4</jackson.version>
- <htmlunit.version>2.44.0</htmlunit.version>
++ <htmlunit.version>2.47.1</htmlunit.version>
+ <jackson.version>2.10.5</jackson.version>
<jaxb.version>2.3.2</jaxb.version>
- <jetty9.version>9.4.30.v20200611</jetty9.version>
- <junit.version>4.13</junit.version>
+ <jetty9.version>9.4.36.v20210114</jetty9.version>
+ <junit.version>4.13.1</junit.version>
<kerby.version>2.0.1</kerby.version>
<log4j.version>1.2.17</log4j.version>
<openjpa.version>3.1.2</openjpa.version>
<servlet.version>3.1.0</servlet.version>
<slf4j.version>1.7.30</slf4j.version>
- <spring.version>4.3.28.RELEASE</spring.version>
+ <spring.version>4.3.30.RELEASE</spring.version>
<spring-ldap-core.version>2.3.3.RELEASE</spring-ldap-core.version>
- <spring.security.version>4.2.18.RELEASE</spring.security.version>
+ <spring.security.version>4.2.19.RELEASE</spring.security.version>
<spring-webflow.version>2.5.1.RELEASE</spring-webflow.version>
- <tomcat.version>9.0.37</tomcat.version>
+ <tomcat.version>9.0.43</tomcat.version>
<validation-api.version>2.0.2</validation-api.version>
- <wss4j.version>2.3.0</wss4j.version>
- <wss4j.version>2.2.6</wss4j.version>
++ <wss4j.version>2.3.1</wss4j.version>
<tomcat.url>http://localhost:8080/manager/text</tomcat.url>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>