Merge branch '3.1.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.1.x-fixes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/63a97dca Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/63a97dca Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/63a97dca Branch: refs/heads/3.1.x-fixes Commit: 63a97dcaaa1b508cf32497f6ee88b4587a750655 Parents: 3001234 d84c16c Author: Daniel Kulp <[email protected]> Authored: Wed Jul 5 11:37:41 2017 -0400 Committer: Daniel Kulp <[email protected]> Committed: Wed Jul 5 11:37:41 2017 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 2 + integration/spring-boot/autoconfigure/pom.xml | 32 +-- maven-plugins/codegen-plugin/pom.xml | 13 +- maven-plugins/codegen-plugin/src/it/README.md | 5 + .../Cxf7067Service-1.0.0.wsdl | 82 ++++++ .../src/it/wsdl-artifact-resolution/pom.xml | 68 +++++ .../cxf/maven_plugin/AbstractCodegenMoho.java | 125 ++++---- .../wsdl2java/WsdlOptionLoader.java | 2 +- maven-plugins/pom.xml | 3 + .../handler/soap/SOAPHandlerInterceptor.java | 67 ++--- .../cxf/jaxrs/client/spec/ClientImpl.java | 2 +- rt/rs/description-swagger/pom.xml | 1 + .../cxf/jaxrs/json/basic/JsonMapObject.java | 4 + .../cxf/jaxrs/ext/search/SearchUtils.java | 1 - .../jaxrs/ext/search/sql/SQLPrinterVisitor.java | 58 +++- .../search/sql/SQLHierarchicalQueryTest.java | 74 +++++ .../jaxrs/AbstractJweJsonWriterProvider.java | 104 ++++++- .../jaxrs/AbstractJwsJsonWriterProvider.java | 31 +- .../jose/jaxrs/JweJsonWriterInterceptor.java | 45 +-- .../jose/jaxrs/JwsJsonWriterInterceptor.java | 47 +-- .../JwsMultipartSignatureInFilter.java | 2 +- .../cxf/rs/security/jose/common/JoseUtils.java | 12 + .../jose/common/KeyManagementUtils.java | 13 + .../cxf/rs/security/jose/jwa/KeyAlgorithm.java | 3 + .../jose/jwe/DirectKeyDecryptionAlgorithm.java | 2 +- .../jose/jwe/DirectKeyEncryptionAlgorithm.java | 5 +- .../rs/security/jose/jwe/JweJsonConsumer.java | 5 +- .../jose/jwe/JweJsonEncryptionEntry.java | 2 +- .../rs/security/jose/jwe/JweJsonProducer.java | 15 +- .../cxf/rs/security/jose/jwe/JweUtils.java | 287 ++++++++++--------- .../cxf/rs/security/jose/jws/JwsUtils.java | 121 ++------ .../security/jose/jwe/JweJsonConsumerTest.java | 14 +- .../cxf/rs/security/jose/jws/JwsUtilsTest.java | 3 +- .../saml/sso/SAMLProtocolResponseValidator.java | 7 +- .../token/provider/jwt/JWTTokenProvider.java | 2 +- .../token/provider/JWTTokenProviderTest.java | 9 +- .../jaxrs/JAXRSClientServerBookTest.java | 2 +- .../systest/jaxrs/security/jose/BookStore.java | 48 ++++ .../security/jose/jwejws/JAXRSJweJsonTest.java | 61 ++-- .../security/jose/jwejws/JAXRSJweJwsTest.java | 29 ++ .../security/jose/jwejws/JAXRSJwsJsonTest.java | 18 +- .../jaxrs/security/certs/jwkPrivateSet.txt | 11 + .../jaxrs/security/jose/jwejws/server.xml | 12 + .../security/jose/jwejws/serverJweJson.xml | 25 +- .../jaxrs/security/jwe.direct.properties | 21 ++ .../systest/jaxrs/security/jwejson1.properties | 22 ++ .../systest/jaxrs/security/jwejson2.properties | 22 ++ .../jaxrs/security/secret.jwk.hmac2.properties | 19 -- 48 files changed, 1037 insertions(+), 521 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/63a97dca/integration/spring-boot/autoconfigure/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/63a97dca/maven-plugins/codegen-plugin/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/63a97dca/maven-plugins/pom.xml ---------------------------------------------------------------------- diff --cc maven-plugins/pom.xml index 605f403,7e50bf2..f5672c1 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@@ -27,9 -27,12 +27,12 @@@ <parent> <groupId>org.apache.cxf</groupId> <artifactId>cxf-parent</artifactId> - <version>3.1.12-SNAPSHOT</version> + <version>3.1.13-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> + <prerequisites> + <maven>${cxf.maven.core.version}</maven> + </prerequisites> <modules> <module>codegen-plugin</module> <module>java2ws-plugin</module> http://git-wip-us.apache.org/repos/asf/cxf/blob/63a97dca/rt/rs/description-swagger/pom.xml ----------------------------------------------------------------------
