[7/7] cxf git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1eedb232 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1eedb232 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1eedb232 Branch: refs/heads/master Commit: 1eedb232f7f97f5d8cb3a8ab4dcd67251e073ec1 Parents: f5ee3b7 Author: Daniel KulpAuthored: Wed Sep 6 12:18:49 2017 -0400 Committer: Daniel Kulp Committed: Wed Sep 6 12:18:49 2017 -0400 -- core/pom.xml| 2 +- distribution/javadoc/pom.xml| 2 +- distribution/manifest/pom.xml | 2 +- distribution/pom.xml| 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../main/release/samples/aegis_standalone/pom.xml | 4 ++-- .../src/main/release/samples/callback/pom.xml | 8 .../samples/clustering/failover_jaxws_osgi/pom.xml | 8 .../samples/clustering/failover_server/pom.xml | 10 +- .../samples/configuration_interceptor/pom.xml | 10 +- .../src/main/release/samples/corba/bank/pom.xml | 8 .../samples/corba/bank_ws_addressing/pom.xml| 8 .../main/release/samples/corba/hello_world/pom.xml | 8 .../release/samples/groovy_spring_support/pom.xml | 8 .../main/release/samples/in_jvm_transport/pom.xml | 10 +- .../main/release/samples/java_first_jaxws/pom.xml | 6 +++--- .../samples/java_first_jaxws_factory_bean/pom.xml | 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../main/release/samples/java_first_pojo/pom.xml| 8 .../samples/java_first_spring_support/pom.xml | 8 .../src/main/release/samples/jax_rs/basic/pom.xml | 8 .../main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../main/release/samples/jax_rs/basic_oidc/pom.xml | 10 +- .../main/release/samples/jax_rs/big_query/pom.xml | 12 ++-- .../samples/jax_rs/content_negotiation/pom.xml | 10 +- .../samples/jax_rs/description_swagger2/pom.xml | 8 .../jax_rs/description_swagger2_osgi/pom.xml| 8 .../jax_rs/description_swagger2_spring/pom.xml | 10 +- .../samples/jax_rs/description_swagger2_web/pom.xml | 8 .../release/samples/jax_rs/minimal_osgi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/search/pom.xml | 14 +++--- .../main/release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +- .../jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +- .../release/samples/jax_rs/spring_security/pom.xml | 8 .../src/main/release/samples/jax_rs/sse_cdi/pom.xml | 8 .../main/release/samples/jax_rs/sse_client/pom.xml | 8 .../main/release/samples/jax_rs/sse_spring/pom.xml | 6 +++--- .../main/release/samples/jax_rs/sse_tomcat/pom.xml | 6 +++--- .../release/samples/jax_rs/tracing_brave/pom.xml| 14 +++--- .../samples/jax_rs/tracing_brave_osgi/pom.xml | 14 +++--- .../release/samples/jax_rs/tracing_htrace/pom.xml | 14 +++--- .../main/release/samples/jax_rs/websocket/pom.xml | 10 +- .../release/samples/jax_rs/websocket_osgi/pom.xml | 8 .../release/samples/jax_rs/websocket_web/pom.xml| 8 .../release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml| 10 +- .../release/samples/jaxws_dispatch_provider/pom.xml | 8 .../src/main/release/samples/jaxws_handlers/pom.xml | 8 .../main/release/samples/jaxws_spring_boot/pom.xml | 2 +- .../samples/jaxws_tracing_brave_osgi/pom.xml| 10 +- .../src/main/release/samples/jms_pubsub/pom.xml | 8 .../src/main/release/samples/jms_queue/pom.xml | 6 +++--- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +++--- .../main/release/samples/jms_spring_config/pom.xml | 6 +++--- .../samples/js_browser_client_java_first/pom.xml| 10 +- .../samples/js_browser_client_simple/pom.xml| 10 +- .../src/main/release/samples/js_client/pom.xml | 10 +- .../src/main/release/samples/js_provider/pom.xml| 8 distribution/src/main/release/samples/mtom/pom.xml | 8 .../src/main/release/samples/oauth/client/pom.xml | 2 +- .../src/main/release/samples/oauth/server/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 2 +- .../main/release/samples/restful_dispatch/pom.xml | 10 +-
[6/7] cxf git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/distribution/src/main/release/samples/jaxws_async/pom.xml -- diff --git a/distribution/src/main/release/samples/jaxws_async/pom.xml b/distribution/src/main/release/samples/jaxws_async/pom.xml index 04328d4..d77a373 100644 --- a/distribution/src/main/release/samples/jaxws_async/pom.xml +++ b/distribution/src/main/release/samples/jaxws_async/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples -3.2.0 +3.2.1-SNAPSHOT ${project.version} @@ -127,17 +127,17 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.2.0 +3.2.1-SNAPSHOT org.apache.cxf cxf-rt-transports-http -3.2.0 +3.2.1-SNAPSHOT org.apache.cxf cxf-rt-transports-http-hc -3.2.0 +3.2.1-SNAPSHOT org.springframework @@ -149,7 +149,7 @@ org.apache.cxf cxf-rt-transports-http-jetty -3.2.0 +3.2.1-SNAPSHOT org.eclipse.jetty http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml -- diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml b/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml index 5f0af9d..00247b9 100644 --- a/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml +++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.2.0 +3.2.1-SNAPSHOT ${project.version} @@ -114,18 +114,18 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.2.0 +3.2.1-SNAPSHOT org.apache.cxf cxf-rt-transports-http -3.2.0 +3.2.1-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty -3.2.0 +3.2.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/distribution/src/main/release/samples/jaxws_handlers/pom.xml -- diff --git a/distribution/src/main/release/samples/jaxws_handlers/pom.xml b/distribution/src/main/release/samples/jaxws_handlers/pom.xml index c5e3105..c4ac03d 100644 --- a/distribution/src/main/release/samples/jaxws_handlers/pom.xml +++ b/distribution/src/main/release/samples/jaxws_handlers/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.2.0 +3.2.1-SNAPSHOT ${project.version} @@ -114,18 +114,18 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.2.0 +3.2.1-SNAPSHOT org.apache.cxf cxf-rt-transports-http -3.2.0 +3.2.1-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty -3.2.0 +3.2.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml -- diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml index 9aa6a36..05df67c 100644 --- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml +++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml @@ -4,7 +4,7 @@ org.apache.cxf.samples cxf-samples -3.2.0 +3.2.1-SNAPSHOT .. spring-boot-sample-ws-cxf http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml -- diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml index 6ca414a..0679959 100644 --- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml +++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples -3.2.0 +3.2.1-SNAPSHOT .. @@ -36,23 +36,23 @@ org.apache.cxf cxf-rt-transports-http -3.2.0
[cxf] Git Push Summary
Repository: cxf Updated Tags: refs/tags/cxf-3.2.0 [created] 79c1486ed
[2/7] cxf git commit: [maven-release-plugin] prepare release cxf-3.2.0
http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/rt/databinding/aegis/pom.xml -- diff --git a/rt/databinding/aegis/pom.xml b/rt/databinding/aegis/pom.xml index 4f71016..751a875 100644 --- a/rt/databinding/aegis/pom.xml +++ b/rt/databinding/aegis/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.0 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/rt/databinding/jaxb/pom.xml -- diff --git a/rt/databinding/jaxb/pom.xml b/rt/databinding/jaxb/pom.xml index 0bfd6b7..2d01825 100644 --- a/rt/databinding/jaxb/pom.xml +++ b/rt/databinding/jaxb/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.0 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/rt/databinding/pom.xml -- diff --git a/rt/databinding/pom.xml b/rt/databinding/pom.xml index e48ebac..7b61d90 100644 --- a/rt/databinding/pom.xml +++ b/rt/databinding/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt -3.2.0-SNAPSHOT +3.2.0 jaxb http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/rt/features/clustering/pom.xml -- diff --git a/rt/features/clustering/pom.xml b/rt/features/clustering/pom.xml index 6faee2c..a87549f 100644 --- a/rt/features/clustering/pom.xml +++ b/rt/features/clustering/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.0 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/rt/features/logging/pom.xml -- diff --git a/rt/features/logging/pom.xml b/rt/features/logging/pom.xml index 86965bb..2ecd824 100644 --- a/rt/features/logging/pom.xml +++ b/rt/features/logging/pom.xml @@ -3,7 +3,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.0 ../../../parent/pom.xml cxf-rt-features-logging http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/rt/features/metrics/pom.xml -- diff --git a/rt/features/metrics/pom.xml b/rt/features/metrics/pom.xml index 68293ee..677249b 100644 --- a/rt/features/metrics/pom.xml +++ b/rt/features/metrics/pom.xml @@ -3,7 +3,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.0 ../../../parent/pom.xml cxf-rt-features-metrics http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/rt/features/pom.xml -- diff --git a/rt/features/pom.xml b/rt/features/pom.xml index 0365bf6..67319a6 100644 --- a/rt/features/pom.xml +++ b/rt/features/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt -3.2.0-SNAPSHOT +3.2.0 clustering http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/rt/features/throttling/pom.xml -- diff --git a/rt/features/throttling/pom.xml b/rt/features/throttling/pom.xml index fa9b832..5060653 100644 --- a/rt/features/throttling/pom.xml +++ b/rt/features/throttling/pom.xml @@ -3,7 +3,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.0 ../../../parent/pom.xml cxf-rt-features-throttling http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/rt/frontend/jaxrs/pom.xml -- diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml index 9eb6483..300d0a5 100644 --- a/rt/frontend/jaxrs/pom.xml +++ b/rt/frontend/jaxrs/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.0 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/rt/frontend/jaxws/pom.xml -- diff --git a/rt/frontend/jaxws/pom.xml b/rt/frontend/jaxws/pom.xml index c72b3e3..65d41b9 100644 --- a/rt/frontend/jaxws/pom.xml +++ b/rt/frontend/jaxws/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.0 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/rt/frontend/js/pom.xml -- diff --git a/rt/frontend/js/pom.xml b/rt/frontend/js/pom.xml index 0899891..915df1a 100644
[5/7] cxf git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/rt/frontend/pom.xml -- diff --git a/rt/frontend/pom.xml b/rt/frontend/pom.xml index 29b1a42..5ad59d8 100644 --- a/rt/frontend/pom.xml +++ b/rt/frontend/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt -3.2.0 +3.2.1-SNAPSHOT simple http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/rt/frontend/simple/pom.xml -- diff --git a/rt/frontend/simple/pom.xml b/rt/frontend/simple/pom.xml index dec634b..5804152 100644 --- a/rt/frontend/simple/pom.xml +++ b/rt/frontend/simple/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0 +3.2.1-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/rt/javascript/javascript-rt/pom.xml -- diff --git a/rt/javascript/javascript-rt/pom.xml b/rt/javascript/javascript-rt/pom.xml index 8e98f7e..36c52d8 100644 --- a/rt/javascript/javascript-rt/pom.xml +++ b/rt/javascript/javascript-rt/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-runtime-javascript -3.2.0 +3.2.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/rt/javascript/javascript-tests/pom.xml -- diff --git a/rt/javascript/javascript-tests/pom.xml b/rt/javascript/javascript-tests/pom.xml index b12fef5..35626a7 100644 --- a/rt/javascript/javascript-tests/pom.xml +++ b/rt/javascript/javascript-tests/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-runtime-javascript -3.2.0 +3.2.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/rt/javascript/pom.xml -- diff --git a/rt/javascript/pom.xml b/rt/javascript/pom.xml index 6f40ea9..de198e1 100644 --- a/rt/javascript/pom.xml +++ b/rt/javascript/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0 +3.2.1-SNAPSHOT ../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/rt/management/pom.xml -- diff --git a/rt/management/pom.xml b/rt/management/pom.xml index e360e4f..c21ab70 100644 --- a/rt/management/pom.xml +++ b/rt/management/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0 +3.2.1-SNAPSHOT ../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/rt/pom.xml -- diff --git a/rt/pom.xml b/rt/pom.xml index ce7dbc7..b47b766 100644 --- a/rt/pom.xml +++ b/rt/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf -3.2.0 +3.2.1-SNAPSHOT wsdl http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/rt/rs/client/pom.xml -- diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml index 53ea552..ffeb8eb 100644 --- a/rt/rs/client/pom.xml +++ b/rt/rs/client/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0 +3.2.1-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/rt/rs/description-swagger/pom.xml -- diff --git a/rt/rs/description-swagger/pom.xml b/rt/rs/description-swagger/pom.xml index e6c2bd8..4df71ed 100644 --- a/rt/rs/description-swagger/pom.xml +++ b/rt/rs/description-swagger/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0 +3.2.1-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/rt/rs/description/pom.xml -- diff --git a/rt/rs/description/pom.xml b/rt/rs/description/pom.xml index 8b50f03..f110d96 100644 --- a/rt/rs/description/pom.xml +++ b/rt/rs/description/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0 +3.2.1-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/1eedb232/rt/rs/extensions/json-basic/pom.xml -- diff --git a/rt/rs/extensions/json-basic/pom.xml b/rt/rs/extensions/json-basic/pom.xml index 43d0c6e..5c63c36 100644 --- a/rt/rs/extensions/json-basic/pom.xml +++ b/rt/rs/extensions/json-basic/pom.xml @@ -27,7 +27,7 @@
[1/7] cxf git commit: [maven-release-plugin] prepare release cxf-3.2.0
Repository: cxf Updated Branches: refs/heads/master 1050ec5cc -> 1eedb232f http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/tools/wsdlto/core/pom.xml -- diff --git a/tools/wsdlto/core/pom.xml b/tools/wsdlto/core/pom.xml index 198e98d..a3b818f 100644 --- a/tools/wsdlto/core/pom.xml +++ b/tools/wsdlto/core/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.0 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/tools/wsdlto/databinding/jaxb/pom.xml -- diff --git a/tools/wsdlto/databinding/jaxb/pom.xml b/tools/wsdlto/databinding/jaxb/pom.xml index 65bdd4f..5c49982 100644 --- a/tools/wsdlto/databinding/jaxb/pom.xml +++ b/tools/wsdlto/databinding/jaxb/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.0 ../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/tools/wsdlto/frontend/javascript/pom.xml -- diff --git a/tools/wsdlto/frontend/javascript/pom.xml b/tools/wsdlto/frontend/javascript/pom.xml index d8a3f81..16bf790 100644 --- a/tools/wsdlto/frontend/javascript/pom.xml +++ b/tools/wsdlto/frontend/javascript/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.0 ../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/tools/wsdlto/frontend/jaxws/pom.xml -- diff --git a/tools/wsdlto/frontend/jaxws/pom.xml b/tools/wsdlto/frontend/jaxws/pom.xml index 312950b..337808a 100644 --- a/tools/wsdlto/frontend/jaxws/pom.xml +++ b/tools/wsdlto/frontend/jaxws/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.0 ../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/tools/wsdlto/misc/pom.xml -- diff --git a/tools/wsdlto/misc/pom.xml b/tools/wsdlto/misc/pom.xml index 58810ba..4684e3d 100644 --- a/tools/wsdlto/misc/pom.xml +++ b/tools/wsdlto/misc/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.0 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/tools/wsdlto/pom.xml -- diff --git a/tools/wsdlto/pom.xml b/tools/wsdlto/pom.xml index 8a44a5e..46015c4 100644 --- a/tools/wsdlto/pom.xml +++ b/tools/wsdlto/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-tools -3.2.0-SNAPSHOT +3.2.0 core http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/tools/wsdlto/test/pom.xml -- diff --git a/tools/wsdlto/test/pom.xml b/tools/wsdlto/test/pom.xml index c335132..64b4c64 100644 --- a/tools/wsdlto/test/pom.xml +++ b/tools/wsdlto/test/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.2.0-SNAPSHOT +3.2.0 ../../../parent/pom.xml
[3/7] cxf git commit: [maven-release-plugin] prepare release cxf-3.2.0
http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml -- diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml index 3dac0f3..23f0bf3 100644 --- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.samples cxf-samples -3.2.0-SNAPSHOT +3.2.0 ../.. @@ -68,17 +68,17 @@ org.apache.cxf cxf-rt-transports-http -3.2.0-SNAPSHOT +3.2.0 org.apache.cxf cxf-rt-transports-websocket -3.2.0-SNAPSHOT +3.2.0 org.apache.cxf cxf-rt-frontend-jaxrs -3.2.0-SNAPSHOT +3.2.0 javax.ws.rs http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml -- diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml index b279852..9b2ce93 100644 --- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples -3.2.0-SNAPSHOT +3.2.0 ../.. @@ -82,17 +82,17 @@ org.apache.cxf cxf-rt-transports-http -3.2.0-SNAPSHOT +3.2.0 org.apache.cxf cxf-rt-transports-websocket -3.2.0-SNAPSHOT +3.2.0 org.apache.cxf cxf-rt-frontend-jaxrs -3.2.0-SNAPSHOT +3.2.0 javax.ws.rs http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml -- diff --git a/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml b/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml index 0533a9e..7fc0ead 100644 --- a/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml +++ b/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.2.0-SNAPSHOT +3.2.0 ${project.version} @@ -82,23 +82,23 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.2.0-SNAPSHOT +3.2.0 org.apache.cxf cxf-rt-databinding-aegis -3.2.0-SNAPSHOT +3.2.0 org.apache.cxf cxf-rt-transports-http -3.2.0-SNAPSHOT +3.2.0 org.apache.cxf cxf-rt-transports-http-jetty -3.2.0-SNAPSHOT +3.2.0 http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/distribution/src/main/release/samples/jaxws_async/pom.xml -- diff --git a/distribution/src/main/release/samples/jaxws_async/pom.xml b/distribution/src/main/release/samples/jaxws_async/pom.xml index 9070007..04328d4 100644 --- a/distribution/src/main/release/samples/jaxws_async/pom.xml +++ b/distribution/src/main/release/samples/jaxws_async/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples -3.2.0-SNAPSHOT +3.2.0 ${project.version} @@ -127,17 +127,17 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.2.0-SNAPSHOT +3.2.0 org.apache.cxf cxf-rt-transports-http -3.2.0-SNAPSHOT +3.2.0 org.apache.cxf cxf-rt-transports-http-hc -3.2.0-SNAPSHOT +3.2.0 org.springframework @@ -149,7 +149,7 @@ org.apache.cxf cxf-rt-transports-http-jetty -3.2.0-SNAPSHOT +3.2.0 org.eclipse.jetty http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ee3b78/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml
[4/7] cxf git commit: [maven-release-plugin] prepare release cxf-3.2.0
[maven-release-plugin] prepare release cxf-3.2.0 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f5ee3b78 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f5ee3b78 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f5ee3b78 Branch: refs/heads/master Commit: f5ee3b786e22a081121eeebbba6d02fa9f4e7206 Parents: 1050ec5 Author: Daniel KulpAuthored: Wed Sep 6 12:18:45 2017 -0400 Committer: Daniel Kulp Committed: Wed Sep 6 12:18:45 2017 -0400 -- core/pom.xml| 2 +- distribution/javadoc/pom.xml| 2 +- distribution/manifest/pom.xml | 2 +- distribution/pom.xml| 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../main/release/samples/aegis_standalone/pom.xml | 4 ++-- .../src/main/release/samples/callback/pom.xml | 8 .../samples/clustering/failover_jaxws_osgi/pom.xml | 8 .../samples/clustering/failover_server/pom.xml | 10 +- .../samples/configuration_interceptor/pom.xml | 10 +- .../src/main/release/samples/corba/bank/pom.xml | 8 .../samples/corba/bank_ws_addressing/pom.xml| 8 .../main/release/samples/corba/hello_world/pom.xml | 8 .../release/samples/groovy_spring_support/pom.xml | 8 .../main/release/samples/in_jvm_transport/pom.xml | 10 +- .../main/release/samples/java_first_jaxws/pom.xml | 6 +++--- .../samples/java_first_jaxws_factory_bean/pom.xml | 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../main/release/samples/java_first_pojo/pom.xml| 8 .../samples/java_first_spring_support/pom.xml | 8 .../src/main/release/samples/jax_rs/basic/pom.xml | 8 .../main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../main/release/samples/jax_rs/basic_oidc/pom.xml | 10 +- .../main/release/samples/jax_rs/big_query/pom.xml | 12 ++-- .../samples/jax_rs/content_negotiation/pom.xml | 10 +- .../samples/jax_rs/description_swagger2/pom.xml | 8 .../jax_rs/description_swagger2_osgi/pom.xml| 8 .../jax_rs/description_swagger2_spring/pom.xml | 10 +- .../samples/jax_rs/description_swagger2_web/pom.xml | 8 .../release/samples/jax_rs/minimal_osgi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/search/pom.xml | 14 +++--- .../main/release/samples/jax_rs/spring_boot/pom.xml | 5 ++--- .../jax_rs/spring_boot_scan/application/pom.xml | 5 ++--- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 5 ++--- .../jax_rs/spring_boot_scan/eureka-registry/pom.xml | 5 ++--- .../release/samples/jax_rs/spring_security/pom.xml | 8 .../src/main/release/samples/jax_rs/sse_cdi/pom.xml | 11 +-- .../main/release/samples/jax_rs/sse_client/pom.xml | 11 +-- .../main/release/samples/jax_rs/sse_spring/pom.xml | 9 - .../main/release/samples/jax_rs/sse_tomcat/pom.xml | 9 - .../release/samples/jax_rs/tracing_brave/pom.xml| 14 +++--- .../samples/jax_rs/tracing_brave_osgi/pom.xml | 14 +++--- .../release/samples/jax_rs/tracing_htrace/pom.xml | 14 +++--- .../main/release/samples/jax_rs/websocket/pom.xml | 10 +- .../release/samples/jax_rs/websocket_osgi/pom.xml | 8 .../release/samples/jax_rs/websocket_web/pom.xml| 8 .../release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml| 10 +- .../release/samples/jaxws_dispatch_provider/pom.xml | 8 .../src/main/release/samples/jaxws_handlers/pom.xml | 8 .../main/release/samples/jaxws_spring_boot/pom.xml | 5 ++--- .../samples/jaxws_tracing_brave_osgi/pom.xml| 10 +- .../src/main/release/samples/jms_pubsub/pom.xml | 8 .../src/main/release/samples/jms_queue/pom.xml | 6 +++--- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +++--- .../main/release/samples/jms_spring_config/pom.xml | 6 +++--- .../samples/js_browser_client_java_first/pom.xml| 10 +- .../samples/js_browser_client_simple/pom.xml| 10 +- .../src/main/release/samples/js_client/pom.xml | 10 +- .../src/main/release/samples/js_provider/pom.xml| 8 distribution/src/main/release/samples/mtom/pom.xml | 8 .../src/main/release/samples/oauth/client/pom.xml | 2 +- .../src/main/release/samples/oauth/server/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 2 +- .../main/release/samples/restful_dispatch/pom.xml | 10 +-
cxf git commit: Re-enabe the wsdlfirst archtpe
Repository: cxf Updated Branches: refs/heads/master 31b566c8b -> 1050ec5cc Re-enabe the wsdlfirst archtpe Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1050ec5c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1050ec5c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1050ec5c Branch: refs/heads/master Commit: 1050ec5cc0cd2996c58e3bc611bc6ced3afcc489 Parents: 31b566c Author: Daniel KulpAuthored: Wed Sep 6 10:13:12 2017 -0400 Committer: Daniel Kulp Committed: Wed Sep 6 11:03:13 2017 -0400 -- maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml | 2 +- maven-plugins/archetypes/pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/1050ec5c/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml -- diff --git a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml index 4d1421d..1062af4 100644 --- a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml +++ b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf cxf-parent -3.0.0-SNAPSHOT +3.2.0-SNAPSHOT ../../../parent/pom.xml org.apache.cxf.archetype http://git-wip-us.apache.org/repos/asf/cxf/blob/1050ec5c/maven-plugins/archetypes/pom.xml -- diff --git a/maven-plugins/archetypes/pom.xml b/maven-plugins/archetypes/pom.xml index a9e8a13..449d982 100644 --- a/maven-plugins/archetypes/pom.xml +++ b/maven-plugins/archetypes/pom.xml @@ -31,6 +31,7 @@ cxf-jaxws-javafirst +cxf-jaxws-wsdlfirst cxf-jaxrs-service
[6/6] cxf git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fe33fced Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fe33fced Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fe33fced Branch: refs/heads/3.1.x-fixes Commit: fe33fcedca2e8ba8699df6ea2c25a49a90e2a4b4 Parents: c98e409 Author: Daniel KulpAuthored: Wed Sep 6 11:14:00 2017 -0400 Committer: Daniel Kulp Committed: Wed Sep 6 11:14:00 2017 -0400 -- core/pom.xml| 2 +- distribution/javadoc/pom.xml| 2 +- distribution/manifest/pom.xml | 2 +- distribution/pom.xml| 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../main/release/samples/aegis_standalone/pom.xml | 4 ++-- .../src/main/release/samples/callback/pom.xml | 8 .../samples/configuration_interceptor/pom.xml | 10 +- .../src/main/release/samples/corba/bank/pom.xml | 8 .../samples/corba/bank_ws_addressing/pom.xml| 8 .../main/release/samples/corba/hello_world/pom.xml | 8 .../release/samples/groovy_spring_support/pom.xml | 8 .../main/release/samples/in_jvm_transport/pom.xml | 10 +- .../main/release/samples/java_first_jaxws/pom.xml | 6 +++--- .../samples/java_first_jaxws_factory_bean/pom.xml | 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../main/release/samples/java_first_pojo/pom.xml| 8 .../samples/java_first_spring_support/pom.xml | 8 .../src/main/release/samples/jax_rs/basic/pom.xml | 8 .../main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../main/release/samples/jax_rs/basic_oidc/pom.xml | 10 +- .../main/release/samples/jax_rs/big_query/pom.xml | 12 ++-- .../samples/jax_rs/content_negotiation/pom.xml | 10 +- .../samples/jax_rs/description_swagger/pom.xml | 10 +- .../samples/jax_rs/description_swagger2/pom.xml | 8 .../jax_rs/description_swagger2_osgi/pom.xml| 8 .../jax_rs/description_swagger2_spring/pom.xml | 10 +- .../samples/jax_rs/description_swagger2_web/pom.xml | 8 .../release/samples/jax_rs/minimal_osgi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/search/pom.xml | 14 +++--- .../main/release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +- .../jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +- .../release/samples/jax_rs/spring_security/pom.xml | 8 .../release/samples/jax_rs/tracing_brave/pom.xml| 14 +++--- .../samples/jax_rs/tracing_brave_osgi/pom.xml | 14 +++--- .../release/samples/jax_rs/tracing_htrace/pom.xml | 14 +++--- .../main/release/samples/jax_rs/websocket/pom.xml | 10 +- .../release/samples/jax_rs/websocket_osgi/pom.xml | 8 .../release/samples/jax_rs/websocket_web/pom.xml| 8 .../release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml| 10 +- .../release/samples/jaxws_dispatch_provider/pom.xml | 8 .../src/main/release/samples/jaxws_handlers/pom.xml | 8 .../main/release/samples/jaxws_spring_boot/pom.xml | 2 +- .../samples/jaxws_tracing_brave_osgi/pom.xml| 10 +- .../src/main/release/samples/jms_pubsub/pom.xml | 8 .../src/main/release/samples/jms_queue/pom.xml | 6 +++--- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +++--- .../main/release/samples/jms_spring_config/pom.xml | 6 +++--- .../samples/js_browser_client_java_first/pom.xml| 10 +- .../samples/js_browser_client_simple/pom.xml| 10 +- .../src/main/release/samples/js_client/pom.xml | 10 +- .../src/main/release/samples/js_provider/pom.xml| 8 .../release/samples/logbrowser-blueprint/pom.xml| 2 +- .../src/main/release/samples/logbrowser/pom.xml | 2 +- distribution/src/main/release/samples/mtom/pom.xml | 8 .../src/main/release/samples/oauth/client/pom.xml | 2 +- .../src/main/release/samples/oauth/server/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 2 +- .../main/release/samples/restful_dispatch/pom.xml | 10 +- .../release/samples/ruby_spring_support/pom.xml | 8 .../src/main/release/samples/soap_header/pom.xml| 8 distribution/src/main/release/samples/sts/pom.xml | 2 +- .../src/main/release/samples/throttling/pom.xml |
[2/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.1.13
http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml -- diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml index 93574c1..dfd26e9 100644 --- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml +++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples -3.1.13-SNAPSHOT +3.1.13 .. @@ -36,23 +36,23 @@ org.apache.cxf cxf-rt-transports-http -3.1.13-SNAPSHOT +3.1.13 org.apache.cxf cxf-rt-transports-http-jetty -3.1.13-SNAPSHOT +3.1.13 org.apache.cxf cxf-rt-frontend-jaxws -3.1.13-SNAPSHOT +3.1.13 org.apache.cxf cxf-integration-tracing-brave -3.1.13-SNAPSHOT +3.1.13 javax.ws.rs http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/distribution/src/main/release/samples/jms_pubsub/pom.xml -- diff --git a/distribution/src/main/release/samples/jms_pubsub/pom.xml b/distribution/src/main/release/samples/jms_pubsub/pom.xml index 153c706..5b89ee2 100644 --- a/distribution/src/main/release/samples/jms_pubsub/pom.xml +++ b/distribution/src/main/release/samples/jms_pubsub/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.1.13-SNAPSHOT +3.1.13 ${project.version} @@ -36,7 +36,7 @@ org.apache.cxf cxf-codegen-plugin -3.1.13-SNAPSHOT +3.1.13 generate-sources @@ -137,12 +137,12 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.1.13-SNAPSHOT +3.1.13 org.apache.cxf cxf-rt-transports-jms -3.1.13-SNAPSHOT +3.1.13 org.apache.activemq http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/distribution/src/main/release/samples/jms_queue/pom.xml -- diff --git a/distribution/src/main/release/samples/jms_queue/pom.xml b/distribution/src/main/release/samples/jms_queue/pom.xml index 7ab15c7..169e4c7 100644 --- a/distribution/src/main/release/samples/jms_queue/pom.xml +++ b/distribution/src/main/release/samples/jms_queue/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.1.13-SNAPSHOT +3.1.13 ${project.version} @@ -137,12 +137,12 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.1.13-SNAPSHOT +3.1.13 org.apache.cxf cxf-rt-transports-jms -3.1.13-SNAPSHOT +3.1.13 org.apache.activemq http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/distribution/src/main/release/samples/jms_spec_demo/pom.xml -- diff --git a/distribution/src/main/release/samples/jms_spec_demo/pom.xml b/distribution/src/main/release/samples/jms_spec_demo/pom.xml index 58f99da..8d6eef5 100644 --- a/distribution/src/main/release/samples/jms_spec_demo/pom.xml +++ b/distribution/src/main/release/samples/jms_spec_demo/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.1.13-SNAPSHOT +3.1.13 ${project.version} @@ -137,12 +137,12 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.1.13-SNAPSHOT +3.1.13 org.apache.cxf cxf-rt-transports-jms -3.1.13-SNAPSHOT +3.1.13 org.apache.activemq http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/distribution/src/main/release/samples/jms_spring_config/pom.xml -- diff --git a/distribution/src/main/release/samples/jms_spring_config/pom.xml b/distribution/src/main/release/samples/jms_spring_config/pom.xml index aba536a..cb27b18 100644 --- a/distribution/src/main/release/samples/jms_spring_config/pom.xml +++ b/distribution/src/main/release/samples/jms_spring_config/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples
[4/6] cxf git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/rt/javascript/javascript-tests/pom.xml -- diff --git a/rt/javascript/javascript-tests/pom.xml b/rt/javascript/javascript-tests/pom.xml index 5416b9f..f48606b 100644 --- a/rt/javascript/javascript-tests/pom.xml +++ b/rt/javascript/javascript-tests/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-runtime-javascript -3.1.13 +3.1.14-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/rt/javascript/pom.xml -- diff --git a/rt/javascript/pom.xml b/rt/javascript/pom.xml index b5f8d21..885c126 100644 --- a/rt/javascript/pom.xml +++ b/rt/javascript/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13 +3.1.14-SNAPSHOT ../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/rt/management-web/pom.xml -- diff --git a/rt/management-web/pom.xml b/rt/management-web/pom.xml index 74bfac7..a2ef938 100644 --- a/rt/management-web/pom.xml +++ b/rt/management-web/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13 +3.1.14-SNAPSHOT ../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/rt/management/pom.xml -- diff --git a/rt/management/pom.xml b/rt/management/pom.xml index 9c838a5..828e8f0 100644 --- a/rt/management/pom.xml +++ b/rt/management/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13 +3.1.14-SNAPSHOT ../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/rt/pom.xml -- diff --git a/rt/pom.xml b/rt/pom.xml index c0c30b7..d0562f7 100644 --- a/rt/pom.xml +++ b/rt/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf -3.1.13 +3.1.14-SNAPSHOT wsdl http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/rt/rs/client/pom.xml -- diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml index 91bfb54..97cf46d 100644 --- a/rt/rs/client/pom.xml +++ b/rt/rs/client/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13 +3.1.14-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/rt/rs/description-swagger/pom.xml -- diff --git a/rt/rs/description-swagger/pom.xml b/rt/rs/description-swagger/pom.xml index 36dd093..de123c5 100644 --- a/rt/rs/description-swagger/pom.xml +++ b/rt/rs/description-swagger/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13 +3.1.14-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/rt/rs/description/pom.xml -- diff --git a/rt/rs/description/pom.xml b/rt/rs/description/pom.xml index 65558e8..a4e2e30 100644 --- a/rt/rs/description/pom.xml +++ b/rt/rs/description/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13 +3.1.14-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/rt/rs/extensions/json-basic/pom.xml -- diff --git a/rt/rs/extensions/json-basic/pom.xml b/rt/rs/extensions/json-basic/pom.xml index 1c3029d..c396964 100644 --- a/rt/rs/extensions/json-basic/pom.xml +++ b/rt/rs/extensions/json-basic/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13 +3.1.14-SNAPSHOT ../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/rt/rs/extensions/providers/pom.xml -- diff --git a/rt/rs/extensions/providers/pom.xml b/rt/rs/extensions/providers/pom.xml index 9acdff9..237867b 100644 --- a/rt/rs/extensions/providers/pom.xml +++ b/rt/rs/extensions/providers/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13 +3.1.14-SNAPSHOT ../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/rt/rs/extensions/search/pom.xml -- diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml index a573edb..95dcd81 100644 ---
[cxf] Git Push Summary
Repository: cxf Updated Tags: refs/tags/cxf-3.1.13 [created] 4870bfd0f
[3/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.1.13
[maven-release-plugin] prepare release cxf-3.1.13 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c98e4091 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c98e4091 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c98e4091 Branch: refs/heads/3.1.x-fixes Commit: c98e40913589f2e696d56b8d121cac3d6686a6f2 Parents: 6261bfe Author: Daniel KulpAuthored: Wed Sep 6 11:13:55 2017 -0400 Committer: Daniel Kulp Committed: Wed Sep 6 11:13:55 2017 -0400 -- core/pom.xml| 2 +- distribution/javadoc/pom.xml| 2 +- distribution/manifest/pom.xml | 2 +- distribution/pom.xml| 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../main/release/samples/aegis_standalone/pom.xml | 4 ++-- .../src/main/release/samples/callback/pom.xml | 8 .../samples/configuration_interceptor/pom.xml | 10 +- .../src/main/release/samples/corba/bank/pom.xml | 8 .../samples/corba/bank_ws_addressing/pom.xml| 8 .../main/release/samples/corba/hello_world/pom.xml | 8 .../release/samples/groovy_spring_support/pom.xml | 8 .../main/release/samples/in_jvm_transport/pom.xml | 10 +- .../main/release/samples/java_first_jaxws/pom.xml | 6 +++--- .../samples/java_first_jaxws_factory_bean/pom.xml | 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../main/release/samples/java_first_pojo/pom.xml| 8 .../samples/java_first_spring_support/pom.xml | 8 .../src/main/release/samples/jax_rs/basic/pom.xml | 8 .../main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../main/release/samples/jax_rs/basic_oidc/pom.xml | 10 +- .../main/release/samples/jax_rs/big_query/pom.xml | 12 ++-- .../samples/jax_rs/content_negotiation/pom.xml | 10 +- .../samples/jax_rs/description_swagger/pom.xml | 10 +- .../samples/jax_rs/description_swagger2/pom.xml | 8 .../jax_rs/description_swagger2_osgi/pom.xml| 8 .../jax_rs/description_swagger2_spring/pom.xml | 10 +- .../samples/jax_rs/description_swagger2_web/pom.xml | 8 .../release/samples/jax_rs/minimal_osgi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/search/pom.xml | 14 +++--- .../main/release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +- .../jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +- .../release/samples/jax_rs/spring_security/pom.xml | 8 .../release/samples/jax_rs/tracing_brave/pom.xml| 14 +++--- .../samples/jax_rs/tracing_brave_osgi/pom.xml | 14 +++--- .../release/samples/jax_rs/tracing_htrace/pom.xml | 14 +++--- .../main/release/samples/jax_rs/websocket/pom.xml | 10 +- .../release/samples/jax_rs/websocket_osgi/pom.xml | 8 .../release/samples/jax_rs/websocket_web/pom.xml| 8 .../release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml| 10 +- .../release/samples/jaxws_dispatch_provider/pom.xml | 8 .../src/main/release/samples/jaxws_handlers/pom.xml | 8 .../main/release/samples/jaxws_spring_boot/pom.xml | 2 +- .../samples/jaxws_tracing_brave_osgi/pom.xml| 10 +- .../src/main/release/samples/jms_pubsub/pom.xml | 8 .../src/main/release/samples/jms_queue/pom.xml | 6 +++--- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +++--- .../main/release/samples/jms_spring_config/pom.xml | 6 +++--- .../samples/js_browser_client_java_first/pom.xml| 10 +- .../samples/js_browser_client_simple/pom.xml| 10 +- .../src/main/release/samples/js_client/pom.xml | 10 +- .../src/main/release/samples/js_provider/pom.xml| 8 .../release/samples/logbrowser-blueprint/pom.xml| 2 +- .../src/main/release/samples/logbrowser/pom.xml | 2 +- distribution/src/main/release/samples/mtom/pom.xml | 8 .../src/main/release/samples/oauth/client/pom.xml | 2 +- .../src/main/release/samples/oauth/server/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 2 +- .../main/release/samples/restful_dispatch/pom.xml | 10 +- .../release/samples/ruby_spring_support/pom.xml | 8 .../src/main/release/samples/soap_header/pom.xml| 8 distribution/src/main/release/samples/sts/pom.xml | 2 +- .../src/main/release/samples/throttling/pom.xml | 2 +-
[1/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.1.13
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 6261bfe85 -> fe33fcedc http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/rt/javascript/javascript-tests/pom.xml -- diff --git a/rt/javascript/javascript-tests/pom.xml b/rt/javascript/javascript-tests/pom.xml index ad9d557..5416b9f 100644 --- a/rt/javascript/javascript-tests/pom.xml +++ b/rt/javascript/javascript-tests/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-runtime-javascript -3.1.13-SNAPSHOT +3.1.13 http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/rt/javascript/pom.xml -- diff --git a/rt/javascript/pom.xml b/rt/javascript/pom.xml index 5763240..b5f8d21 100644 --- a/rt/javascript/pom.xml +++ b/rt/javascript/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13-SNAPSHOT +3.1.13 ../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/rt/management-web/pom.xml -- diff --git a/rt/management-web/pom.xml b/rt/management-web/pom.xml index 14a92a7..74bfac7 100644 --- a/rt/management-web/pom.xml +++ b/rt/management-web/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13-SNAPSHOT +3.1.13 ../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/rt/management/pom.xml -- diff --git a/rt/management/pom.xml b/rt/management/pom.xml index dc7231f..9c838a5 100644 --- a/rt/management/pom.xml +++ b/rt/management/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13-SNAPSHOT +3.1.13 ../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/rt/pom.xml -- diff --git a/rt/pom.xml b/rt/pom.xml index 4eaf1ed..c0c30b7 100644 --- a/rt/pom.xml +++ b/rt/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf -3.1.13-SNAPSHOT +3.1.13 wsdl http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/rt/rs/client/pom.xml -- diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml index dc20a09..91bfb54 100644 --- a/rt/rs/client/pom.xml +++ b/rt/rs/client/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13-SNAPSHOT +3.1.13 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/rt/rs/description-swagger/pom.xml -- diff --git a/rt/rs/description-swagger/pom.xml b/rt/rs/description-swagger/pom.xml index 42635ac..36dd093 100644 --- a/rt/rs/description-swagger/pom.xml +++ b/rt/rs/description-swagger/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13-SNAPSHOT +3.1.13 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/rt/rs/description/pom.xml -- diff --git a/rt/rs/description/pom.xml b/rt/rs/description/pom.xml index 509e128..65558e8 100644 --- a/rt/rs/description/pom.xml +++ b/rt/rs/description/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13-SNAPSHOT +3.1.13 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/rt/rs/extensions/json-basic/pom.xml -- diff --git a/rt/rs/extensions/json-basic/pom.xml b/rt/rs/extensions/json-basic/pom.xml index b381a54..1c3029d 100644 --- a/rt/rs/extensions/json-basic/pom.xml +++ b/rt/rs/extensions/json-basic/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13-SNAPSHOT +3.1.13 ../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/rt/rs/extensions/providers/pom.xml -- diff --git a/rt/rs/extensions/providers/pom.xml b/rt/rs/extensions/providers/pom.xml index 6c9602b..9acdff9 100644 --- a/rt/rs/extensions/providers/pom.xml +++ b/rt/rs/extensions/providers/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.1.13-SNAPSHOT +3.1.13 ../../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/c98e4091/rt/rs/extensions/search/pom.xml -- diff --git
[5/6] cxf git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml -- diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml index dfd26e9..8d252cf 100644 --- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml +++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples -3.1.13 +3.1.14-SNAPSHOT .. @@ -36,23 +36,23 @@ org.apache.cxf cxf-rt-transports-http -3.1.13 +3.1.14-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty -3.1.13 +3.1.14-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxws -3.1.13 +3.1.14-SNAPSHOT org.apache.cxf cxf-integration-tracing-brave -3.1.13 +3.1.14-SNAPSHOT javax.ws.rs http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/distribution/src/main/release/samples/jms_pubsub/pom.xml -- diff --git a/distribution/src/main/release/samples/jms_pubsub/pom.xml b/distribution/src/main/release/samples/jms_pubsub/pom.xml index 5b89ee2..4a68dce 100644 --- a/distribution/src/main/release/samples/jms_pubsub/pom.xml +++ b/distribution/src/main/release/samples/jms_pubsub/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.1.13 +3.1.14-SNAPSHOT ${project.version} @@ -36,7 +36,7 @@ org.apache.cxf cxf-codegen-plugin -3.1.13 +3.1.14-SNAPSHOT generate-sources @@ -137,12 +137,12 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.1.13 +3.1.14-SNAPSHOT org.apache.cxf cxf-rt-transports-jms -3.1.13 +3.1.14-SNAPSHOT org.apache.activemq http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/distribution/src/main/release/samples/jms_queue/pom.xml -- diff --git a/distribution/src/main/release/samples/jms_queue/pom.xml b/distribution/src/main/release/samples/jms_queue/pom.xml index 169e4c7..69a22c7 100644 --- a/distribution/src/main/release/samples/jms_queue/pom.xml +++ b/distribution/src/main/release/samples/jms_queue/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.1.13 +3.1.14-SNAPSHOT ${project.version} @@ -137,12 +137,12 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.1.13 +3.1.14-SNAPSHOT org.apache.cxf cxf-rt-transports-jms -3.1.13 +3.1.14-SNAPSHOT org.apache.activemq http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/distribution/src/main/release/samples/jms_spec_demo/pom.xml -- diff --git a/distribution/src/main/release/samples/jms_spec_demo/pom.xml b/distribution/src/main/release/samples/jms_spec_demo/pom.xml index 8d6eef5..6b65ece 100644 --- a/distribution/src/main/release/samples/jms_spec_demo/pom.xml +++ b/distribution/src/main/release/samples/jms_spec_demo/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.1.13 +3.1.14-SNAPSHOT ${project.version} @@ -137,12 +137,12 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.1.13 +3.1.14-SNAPSHOT org.apache.cxf cxf-rt-transports-jms -3.1.13 +3.1.14-SNAPSHOT org.apache.activemq http://git-wip-us.apache.org/repos/asf/cxf/blob/fe33fced/distribution/src/main/release/samples/jms_spring_config/pom.xml -- diff --git a/distribution/src/main/release/samples/jms_spring_config/pom.xml b/distribution/src/main/release/samples/jms_spring_config/pom.xml index cb27b18..75635b4 100644 --- a/distribution/src/main/release/samples/jms_spring_config/pom.xml +++ b/distribution/src/main/release/samples/jms_spring_config/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples
cxf git commit: Removing a commented dep from systests/jaxrs/pom
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 4962fbdd4 -> 6261bfe85 Removing a commented dep from systests/jaxrs/pom Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6261bfe8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6261bfe8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6261bfe8 Branch: refs/heads/3.1.x-fixes Commit: 6261bfe851ff8e1afcbf72dfaba2cfc95b3e897c Parents: 4962fbd Author: Sergey BeryozkinAuthored: Wed Sep 6 15:28:02 2017 +0100 Committer: Sergey Beryozkin Committed: Wed Sep 6 15:30:24 2017 +0100 -- systests/jaxrs/pom.xml | 7 --- 1 file changed, 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/6261bfe8/systests/jaxrs/pom.xml -- diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml index 843a196..ebbc8da 100644 --- a/systests/jaxrs/pom.xml +++ b/systests/jaxrs/pom.xml @@ -60,13 +60,6 @@ org.glassfish javax.json - javax.el javax.el-api
cxf git commit: Removing a commented dep from systests/jaxrs/pom
Repository: cxf Updated Branches: refs/heads/master 36ca8b05d -> 31b566c8b Removing a commented dep from systests/jaxrs/pom Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/31b566c8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/31b566c8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/31b566c8 Branch: refs/heads/master Commit: 31b566c8b028f71099594b5e2c760e856ef53e8d Parents: 36ca8b0 Author: Sergey BeryozkinAuthored: Wed Sep 6 15:28:02 2017 +0100 Committer: Sergey Beryozkin Committed: Wed Sep 6 15:28:02 2017 +0100 -- systests/jaxrs/pom.xml | 7 --- 1 file changed, 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/31b566c8/systests/jaxrs/pom.xml -- diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml index 542201a..dc2f7a3 100644 --- a/systests/jaxrs/pom.xml +++ b/systests/jaxrs/pom.xml @@ -67,13 +67,6 @@ rxjava ${cxf.rxjava2.version} - javax.el javax.el-api
cxf git commit: Removing Tika Snapshot deps from the demo poms
Repository: cxf Updated Branches: refs/heads/master 6f588b0ce -> 36ca8b05d Removing Tika Snapshot deps from the demo poms Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/36ca8b05 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/36ca8b05 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/36ca8b05 Branch: refs/heads/master Commit: 36ca8b05d55779971e4ecb681122ed610f9d5bf9 Parents: 6f588b0 Author: Sergey BeryozkinAuthored: Wed Sep 6 15:23:55 2017 +0100 Committer: Sergey Beryozkin Committed: Wed Sep 6 15:23:55 2017 +0100 -- .../main/release/samples/jax_rs/search/pom.xml | 27 ++- .../main/release/samples/jax_rs/spark/pom.xml | 28 2 files changed, 13 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/36ca8b05/distribution/src/main/release/samples/jax_rs/search/pom.xml -- diff --git a/distribution/src/main/release/samples/jax_rs/search/pom.xml b/distribution/src/main/release/samples/jax_rs/search/pom.xml index ad2cb20..8f22520b 100644 --- a/distribution/src/main/release/samples/jax_rs/search/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/search/pom.xml @@ -132,18 +132,8 @@ org.apache.tika -tika-core -2.0-SNAPSHOT - - -org.apache.tika -tika-parser-pdf-module -2.0-SNAPSHOT - - -org.apache.tika -tika-parser-office-module -2.0-SNAPSHOT +tika-parsers +1.16 org.apache.commons @@ -167,17 +157,4 @@ 4.5.3 - - -apache-snapshots -http://repository.apache.org/snapshots -Apache Snapshots Repo - -true - - -false - - - http://git-wip-us.apache.org/repos/asf/cxf/blob/36ca8b05/distribution/src/main/release/samples/jax_rs/spark/pom.xml -- diff --git a/distribution/src/main/release/samples/jax_rs/spark/pom.xml b/distribution/src/main/release/samples/jax_rs/spark/pom.xml index fb520ef..01f0e3c 100644 --- a/distribution/src/main/release/samples/jax_rs/spark/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/spark/pom.xml @@ -50,28 +50,27 @@ org.apache.spark spark-streaming_2.10 -2.0.0-preview +2.0.0 io.netty netty + + com.fasterxml.jackson.module + jackson-module-scala_2.10 + -org.apache.tika -tika-core -2.0-SNAPSHOT - - -org.apache.tika -tika-parser-pdf-module -2.0-SNAPSHOT + com.fasterxml.jackson.module + jackson-module-scala_2.10 + 2.9.0.pr3 org.apache.tika -tika-parser-office-module -2.0-SNAPSHOT +tika-parsers +1.16 @@ -93,10 +92,5 @@ - - - snapshots - https://repository.apache.org/content/repositories/snapshots/ - - +
[cxf] Git Push Summary
Repository: cxf Updated Tags: refs/tags/cxf-3.0.15 [created] 2e4c59bdf
[6/6] cxf git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f269b76c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f269b76c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f269b76c Branch: refs/heads/3.0.x-fixes Commit: f269b76c563e43d4306cdf1a93d82f084f421c58 Parents: 4a4aa0e Author: Daniel KulpAuthored: Wed Sep 6 10:18:02 2017 -0400 Committer: Daniel Kulp Committed: Wed Sep 6 10:18:02 2017 -0400 -- core/pom.xml| 2 +- distribution/javadoc/pom.xml| 2 +- distribution/manifest/pom.xml | 2 +- distribution/pom.xml| 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../main/release/samples/aegis_standalone/pom.xml | 4 ++-- .../src/main/release/samples/callback/pom.xml | 8 .../samples/configuration_interceptor/pom.xml | 10 +- .../src/main/release/samples/corba/bank/pom.xml | 8 .../samples/corba/bank_ws_addressing/pom.xml| 8 .../main/release/samples/corba/hello_world/pom.xml | 8 .../release/samples/groovy_spring_support/pom.xml | 8 .../main/release/samples/in_jvm_transport/pom.xml | 10 +- .../main/release/samples/java_first_jaxws/pom.xml | 6 +++--- .../samples/java_first_jaxws_factory_bean/pom.xml | 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../main/release/samples/java_first_pojo/pom.xml| 8 .../samples/java_first_spring_support/pom.xml | 8 .../src/main/release/samples/jax_rs/basic/pom.xml | 8 .../main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../samples/jax_rs/content_negotiation/pom.xml | 10 +- .../samples/jax_rs/description_swagger/pom.xml | 10 +- .../samples/jax_rs/description_swagger2/pom.xml | 10 +- .../jax_rs/description_swagger2_osgi/pom.xml| 8 .../jax_rs/description_swagger2_spring/pom.xml | 10 +- .../samples/jax_rs/description_swagger2_web/pom.xml | 8 .../release/samples/jax_rs/minimal_osgi/pom.xml | 2 +- .../release/samples/jax_rs/spring_security/pom.xml | 8 .../main/release/samples/jax_rs/websocket/pom.xml | 10 +- .../release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml| 10 +- .../release/samples/jaxws_dispatch_provider/pom.xml | 8 .../src/main/release/samples/jaxws_handlers/pom.xml | 8 .../src/main/release/samples/jms_pubsub/pom.xml | 8 .../src/main/release/samples/jms_queue/pom.xml | 6 +++--- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +++--- .../main/release/samples/jms_spring_config/pom.xml | 6 +++--- .../samples/js_browser_client_java_first/pom.xml| 10 +- .../samples/js_browser_client_simple/pom.xml| 10 +- .../src/main/release/samples/js_client/pom.xml | 10 +- .../src/main/release/samples/js_provider/pom.xml| 8 .../release/samples/logbrowser-blueprint/pom.xml| 2 +- .../src/main/release/samples/logbrowser/pom.xml | 2 +- distribution/src/main/release/samples/mtom/pom.xml | 8 .../src/main/release/samples/oauth/client/pom.xml | 2 +- .../src/main/release/samples/oauth/server/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 2 +- .../main/release/samples/restful_dispatch/pom.xml | 10 +- .../release/samples/ruby_spring_support/pom.xml | 8 .../src/main/release/samples/soap_header/pom.xml| 8 distribution/src/main/release/samples/sts/pom.xml | 2 +- .../src/main/release/samples/ws_addressing/pom.xml | 8 .../src/main/release/samples/ws_discovery/pom.xml | 10 +- .../src/main/release/samples/ws_eventing/pom.xml| 2 +- .../main/release/samples/ws_notification/pom.xml| 14 +++--- .../src/main/release/samples/ws_policy/pom.xml | 8 distribution/src/main/release/samples/ws_rm/pom.xml | 10 +- .../release/samples/ws_security/sign_enc/pom.xml| 16 .../samples/ws_security/sign_enc_policy/pom.xml | 2 +- .../src/main/release/samples/ws_security/ut/pom.xml | 10 +- .../release/samples/ws_security/ut_policy/pom.xml | 2 +- .../src/main/release/samples/wsdl_first/pom.xml | 6 +++--- .../samples/wsdl_first_dynamic_client/pom.xml | 8 .../main/release/samples/wsdl_first_https/pom.xml | 2 +- .../release/samples/wsdl_first_pure_xml/pom.xml | 8 .../main/release/samples/wsdl_first_rpclit/pom.xml | 8
[2/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.0.15
http://git-wip-us.apache.org/repos/asf/cxf/blob/4a4aa0e4/distribution/src/main/release/samples/ws_addressing/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_addressing/pom.xml b/distribution/src/main/release/samples/ws_addressing/pom.xml index 71db40a..a9599e9 100644 --- a/distribution/src/main/release/samples/ws_addressing/pom.xml +++ b/distribution/src/main/release/samples/ws_addressing/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.0.15-SNAPSHOT +3.0.15 ${project.version} @@ -126,17 +126,17 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.0.15-SNAPSHOT +3.0.15 org.apache.cxf cxf-rt-transports-http -3.0.15-SNAPSHOT +3.0.15 org.apache.cxf cxf-rt-transports-http-jetty -3.0.15-SNAPSHOT +3.0.15 org.springframework http://git-wip-us.apache.org/repos/asf/cxf/blob/4a4aa0e4/distribution/src/main/release/samples/ws_discovery/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_discovery/pom.xml b/distribution/src/main/release/samples/ws_discovery/pom.xml index 587cff1..43fec43 100644 --- a/distribution/src/main/release/samples/ws_discovery/pom.xml +++ b/distribution/src/main/release/samples/ws_discovery/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.samples cxf-samples -3.0.15-SNAPSHOT +3.0.15 ${project.version} @@ -38,22 +38,22 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.0.15-SNAPSHOT +3.0.15 org.apache.cxf cxf-rt-transports-http -3.0.15-SNAPSHOT +3.0.15 org.apache.cxf.services.ws-discovery cxf-services-ws-discovery-api -3.0.15-SNAPSHOT +3.0.15 org.apache.cxf.services.ws-discovery cxf-services-ws-discovery-service -3.0.15-SNAPSHOT +3.0.15 http://git-wip-us.apache.org/repos/asf/cxf/blob/4a4aa0e4/distribution/src/main/release/samples/ws_eventing/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_eventing/pom.xml b/distribution/src/main/release/samples/ws_eventing/pom.xml index dd41604..5f4ea1e 100644 --- a/distribution/src/main/release/samples/ws_eventing/pom.xml +++ b/distribution/src/main/release/samples/ws_eventing/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.0.15-SNAPSHOT +3.0.15 http://git-wip-us.apache.org/repos/asf/cxf/blob/4a4aa0e4/distribution/src/main/release/samples/ws_notification/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_notification/pom.xml b/distribution/src/main/release/samples/ws_notification/pom.xml index bc7e312..d289eec 100644 --- a/distribution/src/main/release/samples/ws_notification/pom.xml +++ b/distribution/src/main/release/samples/ws_notification/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.0.15-SNAPSHOT +3.0.15 ${project.version} @@ -93,32 +93,32 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.0.15-SNAPSHOT +3.0.15 org.apache.cxf cxf-rt-transports-http -3.0.15-SNAPSHOT +3.0.15 org.apache.cxf cxf-rt-transports-http-jetty -3.0.15-SNAPSHOT +3.0.15 org.apache.cxf cxf-rt-ws-addr -3.0.15-SNAPSHOT +3.0.15 org.apache.cxf cxf-rt-ws-policy -3.0.15-SNAPSHOT +3.0.15 org.apache.cxf.services.wsn cxf-services-wsn-core -3.0.15-SNAPSHOT +3.0.15 http://git-wip-us.apache.org/repos/asf/cxf/blob/4a4aa0e4/distribution/src/main/release/samples/ws_policy/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_policy/pom.xml b/distribution/src/main/release/samples/ws_policy/pom.xml index 9b4fe47..6b089aa 100644 --- a/distribution/src/main/release/samples/ws_policy/pom.xml +++ b/distribution/src/main/release/samples/ws_policy/pom.xml @@ -25,7 +25,7 @@
[1/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.0.15
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes da9b83d71 -> f269b76c5 http://git-wip-us.apache.org/repos/asf/cxf/blob/4a4aa0e4/services/xkms/pom.xml -- diff --git a/services/xkms/pom.xml b/services/xkms/pom.xml index f07f038..106ceef 100644 --- a/services/xkms/pom.xml +++ b/services/xkms/pom.xml @@ -28,7 +28,7 @@ org.apache.cxf.services cxf-services -3.0.15-SNAPSHOT +3.0.15 ../pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/4a4aa0e4/services/xkms/xkms-client/pom.xml -- diff --git a/services/xkms/xkms-client/pom.xml b/services/xkms/xkms-client/pom.xml index 6fd9c52..b677582 100644 --- a/services/xkms/xkms-client/pom.xml +++ b/services/xkms/xkms-client/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.15-SNAPSHOT +3.0.15 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/4a4aa0e4/services/xkms/xkms-common/pom.xml -- diff --git a/services/xkms/xkms-common/pom.xml b/services/xkms/xkms-common/pom.xml index 653c888..2f29b26 100644 --- a/services/xkms/xkms-common/pom.xml +++ b/services/xkms/xkms-common/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.15-SNAPSHOT +3.0.15 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/4a4aa0e4/services/xkms/xkms-features/pom.xml -- diff --git a/services/xkms/xkms-features/pom.xml b/services/xkms/xkms-features/pom.xml index 6403caa..5f47652 100644 --- a/services/xkms/xkms-features/pom.xml +++ b/services/xkms/xkms-features/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.15-SNAPSHOT +3.0.15 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/4a4aa0e4/services/xkms/xkms-itests/pom.xml -- diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml index 8f85adc..af379cf 100644 --- a/services/xkms/xkms-itests/pom.xml +++ b/services/xkms/xkms-itests/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf cxf-parent -3.0.15-SNAPSHOT +3.0.15 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/4a4aa0e4/services/xkms/xkms-osgi/pom.xml -- diff --git a/services/xkms/xkms-osgi/pom.xml b/services/xkms/xkms-osgi/pom.xml index 53b34a0..22dda67 100644 --- a/services/xkms/xkms-osgi/pom.xml +++ b/services/xkms/xkms-osgi/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.15-SNAPSHOT +3.0.15 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/4a4aa0e4/services/xkms/xkms-service/pom.xml -- diff --git a/services/xkms/xkms-service/pom.xml b/services/xkms/xkms-service/pom.xml index 8446b4a..019787d 100644 --- a/services/xkms/xkms-service/pom.xml +++ b/services/xkms/xkms-service/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.15-SNAPSHOT +3.0.15 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/4a4aa0e4/services/xkms/xkms-war/pom.xml -- diff --git a/services/xkms/xkms-war/pom.xml b/services/xkms/xkms-war/pom.xml index 87a9056..7d596ad 100644 --- a/services/xkms/xkms-war/pom.xml +++ b/services/xkms/xkms-war/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.15-SNAPSHOT +3.0.15 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/4a4aa0e4/services/xkms/xkms-x509-handlers/pom.xml -- diff --git a/services/xkms/xkms-x509-handlers/pom.xml b/services/xkms/xkms-x509-handlers/pom.xml index 8032e2a..a9abf5b 100644 --- a/services/xkms/xkms-x509-handlers/pom.xml +++ b/services/xkms/xkms-x509-handlers/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.15-SNAPSHOT +3.0.15 ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/4a4aa0e4/services/xkms/xkms-x509-repo-ldap/pom.xml -- diff --git a/services/xkms/xkms-x509-repo-ldap/pom.xml b/services/xkms/xkms-x509-repo-ldap/pom.xml index ec9fee5..80490da 100644 --- a/services/xkms/xkms-x509-repo-ldap/pom.xml +++
[3/6] cxf git commit: [maven-release-plugin] prepare release cxf-3.0.15
[maven-release-plugin] prepare release cxf-3.0.15 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4a4aa0e4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4a4aa0e4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4a4aa0e4 Branch: refs/heads/3.0.x-fixes Commit: 4a4aa0e4367849e3ab3e1e03ddb45e1ab7b91013 Parents: da9b83d Author: Daniel KulpAuthored: Wed Sep 6 10:17:58 2017 -0400 Committer: Daniel Kulp Committed: Wed Sep 6 10:17:58 2017 -0400 -- core/pom.xml| 2 +- distribution/javadoc/pom.xml| 2 +- distribution/manifest/pom.xml | 2 +- distribution/pom.xml| 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../main/release/samples/aegis_standalone/pom.xml | 4 ++-- .../src/main/release/samples/callback/pom.xml | 8 .../samples/configuration_interceptor/pom.xml | 10 +- .../src/main/release/samples/corba/bank/pom.xml | 8 .../samples/corba/bank_ws_addressing/pom.xml| 8 .../main/release/samples/corba/hello_world/pom.xml | 8 .../release/samples/groovy_spring_support/pom.xml | 8 .../main/release/samples/in_jvm_transport/pom.xml | 10 +- .../main/release/samples/java_first_jaxws/pom.xml | 6 +++--- .../samples/java_first_jaxws_factory_bean/pom.xml | 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../main/release/samples/java_first_pojo/pom.xml| 8 .../samples/java_first_spring_support/pom.xml | 8 .../src/main/release/samples/jax_rs/basic/pom.xml | 8 .../main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../samples/jax_rs/content_negotiation/pom.xml | 10 +- .../samples/jax_rs/description_swagger/pom.xml | 10 +- .../samples/jax_rs/description_swagger2/pom.xml | 10 +- .../jax_rs/description_swagger2_osgi/pom.xml| 8 .../jax_rs/description_swagger2_spring/pom.xml | 10 +- .../samples/jax_rs/description_swagger2_web/pom.xml | 8 .../release/samples/jax_rs/minimal_osgi/pom.xml | 2 +- .../release/samples/jax_rs/spring_security/pom.xml | 8 .../main/release/samples/jax_rs/websocket/pom.xml | 10 +- .../release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml| 10 +- .../release/samples/jaxws_dispatch_provider/pom.xml | 8 .../src/main/release/samples/jaxws_handlers/pom.xml | 8 .../src/main/release/samples/jms_pubsub/pom.xml | 8 .../src/main/release/samples/jms_queue/pom.xml | 6 +++--- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +++--- .../main/release/samples/jms_spring_config/pom.xml | 6 +++--- .../samples/js_browser_client_java_first/pom.xml| 10 +- .../samples/js_browser_client_simple/pom.xml| 10 +- .../src/main/release/samples/js_client/pom.xml | 10 +- .../src/main/release/samples/js_provider/pom.xml| 8 .../release/samples/logbrowser-blueprint/pom.xml| 2 +- .../src/main/release/samples/logbrowser/pom.xml | 2 +- distribution/src/main/release/samples/mtom/pom.xml | 8 .../src/main/release/samples/oauth/client/pom.xml | 2 +- .../src/main/release/samples/oauth/server/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 2 +- .../main/release/samples/restful_dispatch/pom.xml | 10 +- .../release/samples/ruby_spring_support/pom.xml | 8 .../src/main/release/samples/soap_header/pom.xml| 8 distribution/src/main/release/samples/sts/pom.xml | 2 +- .../src/main/release/samples/ws_addressing/pom.xml | 8 .../src/main/release/samples/ws_discovery/pom.xml | 10 +- .../src/main/release/samples/ws_eventing/pom.xml| 2 +- .../main/release/samples/ws_notification/pom.xml| 14 +++--- .../src/main/release/samples/ws_policy/pom.xml | 8 distribution/src/main/release/samples/ws_rm/pom.xml | 10 +- .../release/samples/ws_security/sign_enc/pom.xml| 16 .../samples/ws_security/sign_enc_policy/pom.xml | 2 +- .../src/main/release/samples/ws_security/ut/pom.xml | 10 +- .../release/samples/ws_security/ut_policy/pom.xml | 2 +- .../src/main/release/samples/wsdl_first/pom.xml | 6 +++--- .../samples/wsdl_first_dynamic_client/pom.xml | 8 .../main/release/samples/wsdl_first_https/pom.xml | 2 +- .../release/samples/wsdl_first_pure_xml/pom.xml | 8 .../main/release/samples/wsdl_first_rpclit/pom.xml | 8
[5/6] cxf git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/cxf/blob/f269b76c/distribution/src/main/release/samples/ws_addressing/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_addressing/pom.xml b/distribution/src/main/release/samples/ws_addressing/pom.xml index a9599e9..976f041 100644 --- a/distribution/src/main/release/samples/ws_addressing/pom.xml +++ b/distribution/src/main/release/samples/ws_addressing/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.0.15 +3.0.16-SNAPSHOT ${project.version} @@ -126,17 +126,17 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.0.15 +3.0.16-SNAPSHOT org.apache.cxf cxf-rt-transports-http -3.0.15 +3.0.16-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty -3.0.15 +3.0.16-SNAPSHOT org.springframework http://git-wip-us.apache.org/repos/asf/cxf/blob/f269b76c/distribution/src/main/release/samples/ws_discovery/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_discovery/pom.xml b/distribution/src/main/release/samples/ws_discovery/pom.xml index 43fec43..3ba388b 100644 --- a/distribution/src/main/release/samples/ws_discovery/pom.xml +++ b/distribution/src/main/release/samples/ws_discovery/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.samples cxf-samples -3.0.15 +3.0.16-SNAPSHOT ${project.version} @@ -38,22 +38,22 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.0.15 +3.0.16-SNAPSHOT org.apache.cxf cxf-rt-transports-http -3.0.15 +3.0.16-SNAPSHOT org.apache.cxf.services.ws-discovery cxf-services-ws-discovery-api -3.0.15 +3.0.16-SNAPSHOT org.apache.cxf.services.ws-discovery cxf-services-ws-discovery-service -3.0.15 +3.0.16-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf/blob/f269b76c/distribution/src/main/release/samples/ws_eventing/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_eventing/pom.xml b/distribution/src/main/release/samples/ws_eventing/pom.xml index 5f4ea1e..633f62e 100644 --- a/distribution/src/main/release/samples/ws_eventing/pom.xml +++ b/distribution/src/main/release/samples/ws_eventing/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.0.15 +3.0.16-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf/blob/f269b76c/distribution/src/main/release/samples/ws_notification/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_notification/pom.xml b/distribution/src/main/release/samples/ws_notification/pom.xml index d289eec..753075a 100644 --- a/distribution/src/main/release/samples/ws_notification/pom.xml +++ b/distribution/src/main/release/samples/ws_notification/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.0.15 +3.0.16-SNAPSHOT ${project.version} @@ -93,32 +93,32 @@ org.apache.cxf cxf-rt-frontend-jaxws -3.0.15 +3.0.16-SNAPSHOT org.apache.cxf cxf-rt-transports-http -3.0.15 +3.0.16-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty -3.0.15 +3.0.16-SNAPSHOT org.apache.cxf cxf-rt-ws-addr -3.0.15 +3.0.16-SNAPSHOT org.apache.cxf cxf-rt-ws-policy -3.0.15 +3.0.16-SNAPSHOT org.apache.cxf.services.wsn cxf-services-wsn-core -3.0.15 +3.0.16-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf/blob/f269b76c/distribution/src/main/release/samples/ws_policy/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_policy/pom.xml b/distribution/src/main/release/samples/ws_policy/pom.xml index 6b089aa..5a6efc6 100644 --- a/distribution/src/main/release/samples/ws_policy/pom.xml +++ b/distribution/src/main/release/samples/ws_policy/pom.xml @@ -25,7 +25,7 @@
[4/6] cxf git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/cxf/blob/f269b76c/services/xkms/pom.xml -- diff --git a/services/xkms/pom.xml b/services/xkms/pom.xml index 106ceef..345906d 100644 --- a/services/xkms/pom.xml +++ b/services/xkms/pom.xml @@ -28,7 +28,7 @@ org.apache.cxf.services cxf-services -3.0.15 +3.0.16-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f269b76c/services/xkms/xkms-client/pom.xml -- diff --git a/services/xkms/xkms-client/pom.xml b/services/xkms/xkms-client/pom.xml index b677582..996c850 100644 --- a/services/xkms/xkms-client/pom.xml +++ b/services/xkms/xkms-client/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.15 +3.0.16-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f269b76c/services/xkms/xkms-common/pom.xml -- diff --git a/services/xkms/xkms-common/pom.xml b/services/xkms/xkms-common/pom.xml index 2f29b26..1f3a7da 100644 --- a/services/xkms/xkms-common/pom.xml +++ b/services/xkms/xkms-common/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.15 +3.0.16-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f269b76c/services/xkms/xkms-features/pom.xml -- diff --git a/services/xkms/xkms-features/pom.xml b/services/xkms/xkms-features/pom.xml index 5f47652..aef9022 100644 --- a/services/xkms/xkms-features/pom.xml +++ b/services/xkms/xkms-features/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.15 +3.0.16-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f269b76c/services/xkms/xkms-itests/pom.xml -- diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml index af379cf..ddfd5c5 100644 --- a/services/xkms/xkms-itests/pom.xml +++ b/services/xkms/xkms-itests/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf cxf-parent -3.0.15 +3.0.16-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f269b76c/services/xkms/xkms-osgi/pom.xml -- diff --git a/services/xkms/xkms-osgi/pom.xml b/services/xkms/xkms-osgi/pom.xml index 22dda67..ec1e59a 100644 --- a/services/xkms/xkms-osgi/pom.xml +++ b/services/xkms/xkms-osgi/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.15 +3.0.16-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f269b76c/services/xkms/xkms-service/pom.xml -- diff --git a/services/xkms/xkms-service/pom.xml b/services/xkms/xkms-service/pom.xml index 019787d..03ee682 100644 --- a/services/xkms/xkms-service/pom.xml +++ b/services/xkms/xkms-service/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.15 +3.0.16-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f269b76c/services/xkms/xkms-war/pom.xml -- diff --git a/services/xkms/xkms-war/pom.xml b/services/xkms/xkms-war/pom.xml index 7d596ad..7ca0fad 100644 --- a/services/xkms/xkms-war/pom.xml +++ b/services/xkms/xkms-war/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.15 +3.0.16-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f269b76c/services/xkms/xkms-x509-handlers/pom.xml -- diff --git a/services/xkms/xkms-x509-handlers/pom.xml b/services/xkms/xkms-x509-handlers/pom.xml index a9abf5b..5dd778a 100644 --- a/services/xkms/xkms-x509-handlers/pom.xml +++ b/services/xkms/xkms-x509-handlers/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent -3.0.15 +3.0.16-SNAPSHOT ../../../parent/pom.xml http://git-wip-us.apache.org/repos/asf/cxf/blob/f269b76c/services/xkms/xkms-x509-repo-ldap/pom.xml -- diff --git a/services/xkms/xkms-x509-repo-ldap/pom.xml b/services/xkms/xkms-x509-repo-ldap/pom.xml index 80490da..91d0e53 100644 --- a/services/xkms/xkms-x509-repo-ldap/pom.xml +++ b/services/xkms/xkms-x509-repo-ldap/pom.xml @@ -3,7 +3,7 @@
cxf git commit: The latest JDK on Mac seems to throw a timeout exception instead of a connect exception.
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 528fd9240 -> da9b83d71 The latest JDK on Mac seems to throw a timeout exception instead of a connect exception. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/da9b83d7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/da9b83d7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/da9b83d7 Branch: refs/heads/3.0.x-fixes Commit: da9b83d71ef435825748d8d3cb43edc91699d1aa Parents: 528fd92 Author: Daniel KulpAuthored: Wed Aug 2 11:38:01 2017 -0400 Committer: Daniel Kulp Committed: Wed Sep 6 10:02:34 2017 -0400 -- .../org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java| 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/da9b83d7/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java -- diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java index d82c6ad..ac02cce 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java @@ -110,7 +110,8 @@ public class WSAPureWsdlTest extends AbstractWSATestBase { } catch (Exception t) { //expected assertTrue(t.getCause().getCause().toString(), - t.getCause().getCause() instanceof java.net.ConnectException); + t.getCause().getCause() instanceof java.net.ConnectException + || t.getCause().getCause() instanceof java.net.SocketTimeoutException); } synchronized (handler) { port.addNumbersAsync(25, 25, handler); @@ -280,4 +281,4 @@ public class WSAPureWsdlTest extends AbstractWSATestBase { assertNotNull("Service is null ", service); return service.getAddNumbersPort(); } -} \ No newline at end of file +}
[3/4] cxf git commit: Recording .gitmergeinfo Changes
Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/022dca82 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/022dca82 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/022dca82 Branch: refs/heads/3.0.x-fixes Commit: 022dca8264bdca3bca35bd7d8e78e98afe009910 Parents: 3a6e0f4 Author: Daniel KulpAuthored: Wed Sep 6 09:33:35 2017 -0400 Committer: Daniel Kulp Committed: Wed Sep 6 09:33:35 2017 -0400 -- .gitmergeinfo | 47 +++ 1 file changed, 47 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/022dca82/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index ca3cac8..bb4bf49 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -11,6 +11,7 @@ B 013eb89d0453bf897d219b762e50ab5232f6ca00 B 015419bf394e219cbb07ca7706b4bd8e2942e856 B 015d7a6dde4e201aaf8eaa90343b6ca9a20f6856 B 01956cc9af68f80d4f12018a3779c12f36d5308e +B 0198879e73af6815648188318b502b47debaa76f B 01bf5f841d27d94485018912a575e4d9b50caab9 B 029d61d470bf885e093e4211dd13a7b54fe8ae7a B 02ad8d847f014b9b04af74c7e4eb7407899546eb @@ -33,6 +34,7 @@ B 04932cc6e66a6bca0ae25f2bf68e97f6241736eb B 04960b3a04731e3e0f030c17ac25f154defb5568 B 04f0ef2e32f55d51f14cfc6d7a14616b62a6cce5 B 0522c5be3b5d4b078d0943119f82def133ca4a20 +B 056806d5edf07fe02d988214a24777e2d44e9957 B 059cb2b9f668768fad70d408932b523572f42054 B 05a7ad32b06dc800d31cffbb39df5be16f847849 B 05e838902732c879e6a9415f11624d1581b5271e @@ -76,6 +78,7 @@ B 0ac5dde071c9c2731fca757a2108f5dd698f8af5 B 0afa064ee3b92a6b3e5fd8c5205a287d7884353b B 0b094e88f775dc10caea0b85a52dcc21ef45300c B 0b40c84e1440601a9b8779b93812b1c41cddd138 +B 0b5f511f01631cc28f12e383b949c72e8afe432e B 0b7e0e914328aa7a78a2eab00bb1040c703e9b63 B 0b9097fbd1cddbb4a183e9448576bde2a6eb2589 B 0ba04d859c6df8b9d31163e7c65aa1addbb2 @@ -161,10 +164,12 @@ B 161e10bb2d87573974b8a1748f023c47ebbe5d49 B 162bbb5ea63cfeb6c258d750627c77c9e694f928 B 163e1d2361643251b31b6fdf7def0b52542577dd B 165ebbf9d0b5541b6abdd5c140cfe921d92cf869 +B 166321a8848b82dfcefd0e03f9ee9ca301fe7dcd B 1674e7fb3353fc9e5d2b81deb2d02617cc09a373 B 16a275642f2621ce23772bacfd88a4bd93334e20 B 16d789c4a913e0cac51bcf929331abe84010ce1e B 16dd8a3eab9666ff42b91990b0bcc8b7708ed952 +B 16ddd3ee156066074b26834a91b6d2ba520d7c93 B 1700674150b8619c99ae02fdbd374b08d1855c29 B 171a60f47bb6fbe50790bec49abb122301966d6e B 171feb8042756c2946435448fbf13605470958d3 @@ -181,6 +186,7 @@ B 18679904c12642350f851e0f5b406f97a79732c8 B 1877bec24b36fb4e8849bd0c54bc474e7a572b5f B 18d64577e5ef1ef3ce26e82db1821b894bd43578 B 18f06322f8e14ca7e7ffed682851c8448181cd2c +B 193c5c4095d93ca8efe3e9a4b91fba705de8af46 B 194224faeb3e8eb6c8feabe6397f6b42ff0f605d B 194694aa38500a6b0042f97e1cafd742126bf527 B 194f9cd98da50140e8184ff4835811875aa5ecfe @@ -288,6 +294,7 @@ B 2728bb512a58c6337b30d64087f0ee9d00805091 B 27398c0edc71cabb40180cb1d88eb3cd92afa91c B 2741e4a4d763617df2149736a716e589fffcc8b8 B 27917f3accef78556fa7ed8e79f1746052bfd4d9 +B 27a11b1e5838d7b1062dbb2f03fc105cb8c30d9f B 27a95f050bfdbeb9d3e63af11fc2e8c4370ae549 B 27ae9979b88540574ee59c487f43c20c877c8be3 B 27c2c25dc3c2c3019543e31afdca7b166911f278 @@ -322,6 +329,7 @@ B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a B 2b16a75d07fe32bf9604186b873e729cd6992fe9 B 2b1766a22b17beb4cd462c728d3234be04dfaeee B 2b24f8986897add53c9c7b76c4e5bd10dc5646d7 +B 2b488ef7728b7d15dd663a7e7c841f0adfca5c89 B 2b5904f6d8b529e7ae18719b5bfab0560abb1e95 B 2b7d42009eebfdf3005540e5621746f95786c151 B 2ba77327488a8446e6a92af137f644eaf3b06e2e @@ -458,6 +466,7 @@ B 3b272f9a3ae43861a4e5894ea9d622954f0f5208 B 3b2ce76de26f35cf782f2607ca65f715a2caae50 B 3b8e7c156d703cfd363a4c5427592e38396a926a B 3c2092b369f06d4f71134397240092a659bcbca1 +B 3c37b64cb7b33acbb8c8f8e557b24f313914bed6 B 3c3aabef1e63a82e4b07746decdc6da32109d85d B 3c788423d2da7b3ed103b1b3b225b31517660049 B 3c804f7dd89613a47835bcdabf63e9b64bdee79c @@ -487,6 +496,7 @@ B 40c9bfd5ee0ba7cccd7abc7e7d19db531e212c97 B 40e31a9f14bb9e494c9240463e17ed232e201876 B 410bfd6579514128ac22c5c1b61df9dafcd8b84c B 411dff107d089001ffa836bc196f91ab873f76cf +B 417b13b074fc5b3ad36947f539144182173a2213 B 418e1ad6ac02aade431e749ac241ca70e01d2b83 B 41f324f74b1fae29969d055bba465f0aab9b37a6 B 42739ef5d3b078d7960033511a551bd80ac1b36e @@ -541,12 +551,14 @@ B 46838d8a346687e9f8ff2f6e279e3ba83f99c5f3 B 468cb39200d7ef9cb4bcbbb379161a437c98618c B 46bb02fe8243f1954aa1e2a6bcf9d08a3226f73b B 46ce1778d9a4d6a30e38b393a08dd4ecae2dbb09 +B 46d5cebc983c7b21d736fd8fa82d61680f86db6c B 46f0d5fff8a4d846831b5e9d7ac0405fe06d2ccd B 46fec2059cdd278b6dd9ad41307b5d758f96eddb B 4702274c7a8bad71ab512744ad39f5207bfe86cd B
[4/4] cxf git commit: Update 3.0.15 release notes
Update 3.0.15 release notes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/528fd924 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/528fd924 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/528fd924 Branch: refs/heads/3.0.x-fixes Commit: 528fd9240d756e40d49b1c6e3a85b566e3c782d6 Parents: 022dca8 Author: Daniel KulpAuthored: Wed Sep 6 09:48:06 2017 -0400 Committer: Daniel Kulp Committed: Wed Sep 6 09:48:06 2017 -0400 -- distribution/src/main/release/release_notes.txt | 43 1 file changed, 18 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/528fd924/distribution/src/main/release/release_notes.txt -- diff --git a/distribution/src/main/release/release_notes.txt b/distribution/src/main/release/release_notes.txt index 13e70f6..5b8ca11 100644 --- a/distribution/src/main/release/release_notes.txt +++ b/distribution/src/main/release/release_notes.txt @@ -1,4 +1,4 @@ -Apache CXF 3.0.14 Release Notes +Apache CXF 3.0.15 Release Notes 1. Overview @@ -22,7 +22,7 @@ Users are encourage to review the migration guide at: http://cxf.apache.org/docs/30-migration-guide.html for further information and requirements for upgrading from 2.7.x. -3.0.14 fixes over 17 JIRA issues reported by users and the community. +3.0.15 fixes over 14 JIRA issues reported by users and the community. @@ -67,30 +67,23 @@ for caveats when upgrading from CXF 2.7.x to 3.0.0 7. Specific issues, features, and improvements fixed in this version ** Bug -* [CXF-6441] - JMS Subscription: pubSubNoLocal is not propagated into AbstractMessageListenerContainer -* [CXF-6782] - Modifications to JAX-WS client request context leak the thread scope -* [CXF-7178] - RMPolicyInterceptorProvider not initialized properly -* [CXF-7318] - Continuation.suspend(-1) does not resume request -* [CXF-7320] - Returned charset is not decoded properly -* [CXF-7331] - javax.ws.rs.container.ResourceInfo#getResourceClass doesnt unwrap the class -* [CXF-7350] - the exception should be able to return to client if retry is 0 with ws-rm -* [CXF-7351] - JAXRS UriInfo.getMatchedURIs raises error for templated URI -* [CXF-7352] - JAXRS UriInfo.getMatchedResources does return matched resource twice when CORS filter is used -* [CXF-7356] - need consider SoapBinding has multiple default namespace when compare two bindingId -* [CXF-7368] - JAXB provider is handling non-jaxb classes -* [CXF-7381] - DateFormat in MapEventLogger in the STS is not thread safe -* [CXF-7401] - CXF http-jetty fails to get private key if the jks keystore file contains multiple private keys with different password -* [CXF-7417] - Updating relative paths after passing them to UriBuilder.fromUri does not work -* [CXF-7429] - NPE in WriterInterceptorMBW when writer is null and Log is fine - -** Improvement -* [CXF-7327] - Improve logging for invalid enum values -* [CXF-7424] - Remove redundant byte array conversion from BinaryDataProvider - - - - +** Bug +* [CXF-7389] - JAXRSUtils warning logs +* [CXF-7412] - PhaseInterceptorChain has thrown exception, unwinding now java.lang.NullPointerException: null at org.apache.cxf.binding.soap.saaj.SAAJUtils.getHeader(SAAJUtils.java:43) +* [CXF-7430] - The logInputStream method of the LoggingInInterceptor fails if input stream size bigger than limit and PrettyPrint option is true. +* [CXF-7438] - Xml validation error with MTOM +* [CXF-7440] - VariantListBuilderImpl build() don't work without add method +* [CXF-7443] - ClassCastException in org.apache.cxf.transport.http.Headers +* [CXF-7447] - Java 2 security issues +* [CXF-7453] - WebFaultOutInterceptor calls getFaultSubcodes() even in case of SOAP1.1 faults +* [CXF-7454] - NullPointerException during wsdl validation +* [CXF-7478] - Response entity can not be auto-closed if the entity is read implicitly +* [CXF-7483] - JAXRSServerFactoryBeanDefinitionParser doesn't log autowire failures +** Improvement +* [CXF-7419] - Support subresource locators returning the classes +* [CXF-7436] - Enhance Search SQLPrinterVisitor to support hierarchical queries +* [CXF-7492] - Add a new wadltojava 'authorization' option
[2/4] cxf git commit: [CXF-7494] Handle SOAPAction with single quotes
[CXF-7494] Handle SOAPAction with single quotes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3a6e0f4a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3a6e0f4a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3a6e0f4a Branch: refs/heads/3.0.x-fixes Commit: 3a6e0f4a0aca0d53f88d78b342e1755336fedeb0 Parents: 2d90e1e Author: Dennis KieselhorstAuthored: Mon Sep 4 12:43:09 2017 +0200 Committer: Daniel Kulp Committed: Wed Sep 6 09:33:25 2017 -0400 -- .../cxf/binding/soap/interceptor/SoapActionInInterceptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/3a6e0f4a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java -- diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java index b9ad7d7..6302435 100644 --- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java +++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java @@ -67,7 +67,7 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor { List sa = headers.get(SoapBindingConstants.SOAP_ACTION); if (sa != null && sa.size() > 0) { String action = sa.get(0); -if (action.startsWith("\"")) { +if (action.startsWith("\"") || action.startsWith("\'")) { action = action.substring(1, action.length() - 1); } return action;
[1/4] cxf git commit: [CXF-7438] Expand the checks for MTOM and schema validation Patch from Casper Biever applied
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 2d6e4e9cb -> 528fd9240 [CXF-7438] Expand the checks for MTOM and schema validation Patch from Casper Biever applied # Conflicts: # core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2d90e1e7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2d90e1e7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2d90e1e7 Branch: refs/heads/3.0.x-fixes Commit: 2d90e1e71db008042f3b6818ac380df56af99610 Parents: 2d6e4e9 Author: Daniel KulpAuthored: Tue Aug 1 14:31:09 2017 -0400 Committer: Daniel Kulp Committed: Wed Sep 6 09:31:04 2017 -0400 -- .../src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java| 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/2d90e1e7/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java -- diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java index 77563a9..a14a32e 100644 --- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java +++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java @@ -97,9 +97,10 @@ public class DataWriterImpl extends JAXBDataBase implements DataWriter { } public boolean handleEvent(ValidationEvent event) { -// CXF-1194 this hack is specific to MTOM, so pretty safe to leave in here before calling the origHandler. +// CXF-1194/CXF-7438 this hack is specific to MTOM, so pretty safe to leave in +// here before calling the origHandler. String msg = event.getMessage(); -if (msg.startsWith("cvc-type.3.1.2") +if ((msg.startsWith("cvc-type.3.1.2") || msg.startsWith("cvc-complex-type.2.2")) && msg.contains(marshaller.getLastMTOMElementName().getLocalPart())) { return true; }
cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes ca4c39818 -> 4962fbdd4 Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4962fbdd Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4962fbdd Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4962fbdd Branch: refs/heads/3.1.x-fixes Commit: 4962fbdd4ef1ec0b83e579f381e9691da21faa7c Parents: ca4c398 Author: Daniel KulpAuthored: Wed Sep 6 08:46:41 2017 -0400 Committer: Daniel Kulp Committed: Wed Sep 6 08:46:41 2017 -0400 -- .gitmergeinfo | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/4962fbdd/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index d8b8fa8..ad72e81 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -25,6 +25,7 @@ B 09121b3abf54697f576d4d067190ce696f2f0338 B 09893c1747d823b3456a28fc49468ed91e456f2d B 09a3b58100c04cacf755509a0160ba01bbce769a B 0a4d26766122177fe1a919ae1e00bb1d93712c6f +B 0a4e29637cb94af07e70a5e87b42943f229edeb3 B 0aae7480b870b19e61913e3bbbeacefad471480b B 0ada3f2b8ce9575ce27ed67b1eeecaf0be52943e B 0af65a4ab3ef2c31b9e88d34ddfbb05c79f0f50c @@ -253,6 +254,7 @@ B 6fcdc7e9eec2414a40bd3161cf237ef182e313a6 B 702389744199001e6c35e602ffb197ebaaf84838 B 706eacc5ae12e1c95085d2f8602c632c921e849e B 707fa4f3c3f3aa40979e57468a9ac3eb3102a71f +B 70ac8edcc95d88ae4a338005ffd07fe149b46793 B 7263bb6f9e9025c31cd5bcab1f270805587a6a6d B 73d1f886ae5265131e8664ee952ffd1cdc82f71a B 741c9e349e7e48d3fe278ba8d8f17dd6bf4c4370 @@ -487,6 +489,7 @@ B e1a5b307ca62fd05b23eb421b7a10c6d2b4b9a60 B e1c60863ac10b56d423613c7d3d2f45c7ce18e14 B e1d950605941ef77bd4a3e9e4ad47eb63ac8f221 B e262bd20dbc8e8567ffe0c8ed3d394191696e981 +B e2a3839f6a7fef158cec443a6f2e69c97ae407b6 B e2efd0386e210d162c7646f4a4f2aa15e9752924 B e3abb5e1c016da5dedd6a035b0fd5507aa339314 B e3b77cc7100f304dcf8d5e29bce78c800c4d4cd1 @@ -682,6 +685,7 @@ M 5022be0c15d90800ee983fe94b07a10a54814991 M 50d3f48781cef7fdde9d4b2c4232feb2c2f4c8aa M 52d77470228a3560f464003c68b30ffe8f1e8b9c M 530498a452a1445d4b7157f521590296ba45ec75 +M 53479782d9acc56f3b88700941f0b33215661769 M 539cbd70fb39676d64d0987e570fe69ff3d485d3 M 56fc03c41782ef3e706d7126063a7baffd4a5cb9 M 5724e615409916ce3176d430cb91bae44f3447d9
cxf git commit: [CXF-7493] Adding another test
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 21c1f81d0 -> 2d6e4e9cb [CXF-7493] Adding another test Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2d6e4e9c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2d6e4e9c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2d6e4e9c Branch: refs/heads/3.0.x-fixes Commit: 2d6e4e9cbe40e21903117498496d42ee3ae30364 Parents: 21c1f81 Author: Sergey BeryozkinAuthored: Wed Sep 6 12:21:39 2017 +0100 Committer: Sergey Beryozkin Committed: Wed Sep 6 12:24:43 2017 +0100 -- .../org/apache/cxf/systest/jaxrs/BookStore.java | 21 .../jaxrs/JAXRS20ClientServerBookTest.java | 11 ++ 2 files changed, 32 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/2d6e4e9c/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java -- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java index 557b6da..aee5a6f 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java @@ -50,6 +50,7 @@ import javax.ws.rs.Encoded; import javax.ws.rs.GET; import javax.ws.rs.HEAD; import javax.ws.rs.HeaderParam; +import javax.ws.rs.InternalServerErrorException; import javax.ws.rs.MatrixParam; import javax.ws.rs.OPTIONS; import javax.ws.rs.POST; @@ -166,6 +167,26 @@ public class BookStore { return new BookType("root", 124L); } @GET +@Path("/listoflonganddouble") +@Produces("text/xml") +public Book getBookFromListOfLongAndDouble(@QueryParam("value") List lValue, + @QueryParam("value") List dValue) { +StringBuilder lBuilder = new StringBuilder(); +for (Long v : lValue) { +lBuilder.append(v.longValue()); +} +StringBuilder dBuilder = new StringBuilder(); +for (Double v : dValue) { +dBuilder.append(v.longValue()); +} +String lStr = lBuilder.toString(); +String dStr = dBuilder.toString(); +if (!lStr.equals(dStr)) { +throw new InternalServerErrorException(); +} +return new Book("cxf", Long.parseLong(lStr)); +} +@GET @Path("/") public Book getBookRoot() { return new Book("root", 124L); http://git-wip-us.apache.org/repos/asf/cxf/blob/2d6e4e9c/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java -- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java index 036ce25..65fbb35 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java @@ -108,6 +108,17 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase } @Test +public void testListOfLongAndDoubleQuery() throws Exception { +WebTarget echoEndpointTarget = ClientBuilder +.newClient() +.target("http://localhost:; + PORT + "/bookstore/listoflonganddouble") +.queryParam("value", 1, 0, 2, 3); + +Book book = echoEndpointTarget.request().accept("text/xml").get(Book.class); +assertEquals(1023L, book.getId()); +} + +@Test public void testGetGenericBook() throws Exception { String address = "http://localhost:; + PORT + "/bookstore/genericbooks/123"; doTestGetGenericBook(address, 124L, false);
cxf git commit: [CXF-7493] Adding another test
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes a6bd0f9c0 -> ca4c39818 [CXF-7493] Adding another test Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ca4c3981 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ca4c3981 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ca4c3981 Branch: refs/heads/3.1.x-fixes Commit: ca4c398182361d530e1c518f7bdf2694d0373b08 Parents: a6bd0f9 Author: Sergey BeryozkinAuthored: Wed Sep 6 12:21:39 2017 +0100 Committer: Sergey Beryozkin Committed: Wed Sep 6 12:23:07 2017 +0100 -- .../org/apache/cxf/systest/jaxrs/BookStore.java | 21 .../jaxrs/JAXRS20ClientServerBookTest.java | 11 ++ 2 files changed, 32 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/ca4c3981/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java -- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java index f8b07a7..49b173f 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java @@ -50,6 +50,7 @@ import javax.ws.rs.Encoded; import javax.ws.rs.GET; import javax.ws.rs.HEAD; import javax.ws.rs.HeaderParam; +import javax.ws.rs.InternalServerErrorException; import javax.ws.rs.MatrixParam; import javax.ws.rs.OPTIONS; import javax.ws.rs.POST; @@ -166,6 +167,26 @@ public class BookStore { return new BookType("root", 124L); } @GET +@Path("/listoflonganddouble") +@Produces("text/xml") +public Book getBookFromListOfLongAndDouble(@QueryParam("value") List lValue, + @QueryParam("value") List dValue) { +StringBuilder lBuilder = new StringBuilder(); +for (Long v : lValue) { +lBuilder.append(v.longValue()); +} +StringBuilder dBuilder = new StringBuilder(); +for (Double v : dValue) { +dBuilder.append(v.longValue()); +} +String lStr = lBuilder.toString(); +String dStr = dBuilder.toString(); +if (!lStr.equals(dStr)) { +throw new InternalServerErrorException(); +} +return new Book("cxf", Long.parseLong(lStr)); +} +@GET @Path("/") public Book getBookRoot() { return new Book("root", 124L); http://git-wip-us.apache.org/repos/asf/cxf/blob/ca4c3981/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java -- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java index 45a09e0..b9b6fe4 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java @@ -108,6 +108,17 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase } @Test +public void testListOfLongAndDoubleQuery() throws Exception { +WebTarget echoEndpointTarget = ClientBuilder +.newClient() +.target("http://localhost:; + PORT + "/bookstore/listoflonganddouble") +.queryParam("value", 1, 0, 2, 3); + +Book book = echoEndpointTarget.request().accept("text/xml").get(Book.class); +assertEquals(1023L, book.getId()); +} + +@Test public void testGetGenericBook() throws Exception { String address = "http://localhost:; + PORT + "/bookstore/genericbooks/123"; doTestGetGenericBook(address, 124L, false);
cxf git commit: [CXF-7493] Adding another test
Repository: cxf Updated Branches: refs/heads/master 53479782d -> 6f588b0ce [CXF-7493] Adding another test Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6f588b0c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6f588b0c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6f588b0c Branch: refs/heads/master Commit: 6f588b0cef87d157864c52c140bec616f9c5f029 Parents: 5347978 Author: Sergey BeryozkinAuthored: Wed Sep 6 12:21:39 2017 +0100 Committer: Sergey Beryozkin Committed: Wed Sep 6 12:21:39 2017 +0100 -- .../org/apache/cxf/systest/jaxrs/BookStore.java | 21 .../jaxrs/JAXRS20ClientServerBookTest.java | 11 ++ 2 files changed, 32 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/6f588b0c/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java -- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java index 304b7fe..fe84366 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java @@ -50,6 +50,7 @@ import javax.ws.rs.Encoded; import javax.ws.rs.GET; import javax.ws.rs.HEAD; import javax.ws.rs.HeaderParam; +import javax.ws.rs.InternalServerErrorException; import javax.ws.rs.MatrixParam; import javax.ws.rs.OPTIONS; import javax.ws.rs.POST; @@ -166,6 +167,26 @@ public class BookStore { return new BookType("root", 124L); } @GET +@Path("/listoflonganddouble") +@Produces("text/xml") +public Book getBookFromListOfLongAndDouble(@QueryParam("value") List lValue, + @QueryParam("value") List dValue) { +StringBuilder lBuilder = new StringBuilder(); +for (Long v : lValue) { +lBuilder.append(v.longValue()); +} +StringBuilder dBuilder = new StringBuilder(); +for (Double v : dValue) { +dBuilder.append(v.longValue()); +} +String lStr = lBuilder.toString(); +String dStr = dBuilder.toString(); +if (!lStr.equals(dStr)) { +throw new InternalServerErrorException(); +} +return new Book("cxf", Long.parseLong(lStr)); +} +@GET @Path("/") public Book getBookRoot() { return new Book("root", 124L); http://git-wip-us.apache.org/repos/asf/cxf/blob/6f588b0c/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java -- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java index 1d1fdf5..dc61df7 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java @@ -110,6 +110,17 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase } @Test +public void testListOfLongAndDoubleQuery() throws Exception { +WebTarget echoEndpointTarget = ClientBuilder +.newClient() +.target("http://localhost:; + PORT + "/bookstore/listoflonganddouble") +.queryParam("value", 1, 0, 2, 3); + +Book book = echoEndpointTarget.request().accept("text/xml").get(Book.class); +assertEquals(1023L, book.getId()); +} + +@Test public void testGetGenericBook() throws Exception { String address = "http://localhost:; + PORT + "/bookstore/genericbooks/123"; doTestGetGenericBook(address, 124L, false);
cxf git commit: [CXF-7493] Adding a test
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 582e3c065 -> 21c1f81d0 [CXF-7493] Adding a test Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/21c1f81d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/21c1f81d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/21c1f81d Branch: refs/heads/3.0.x-fixes Commit: 21c1f81d08a4cbc15ce52847cf4ba1c6f8eae933 Parents: 582e3c0 Author: Sergey BeryozkinAuthored: Wed Sep 6 10:42:38 2017 +0100 Committer: Sergey Beryozkin Committed: Wed Sep 6 10:54:17 2017 +0100 -- .../test/java/org/apache/cxf/jaxrs/Customer.java | 10 +++--- .../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java| 18 +++--- 2 files changed, 22 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/21c1f81d/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java -- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java index 1e4bde1..d46e68d 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java @@ -371,8 +371,9 @@ public class Customer extends AbstractCustomer implements CustomerInfo { public void testQueryIntArray(@QueryParam("query") int[] query) { // complete } - -@Produces("text/xml") + +@Produces("text/xml") +//CHECKSTYLE:OFF public void testQueryAsList( @DefaultValue("default") @QueryParam("query") List queryString, @QueryParam("query2") List queryString2, @@ -380,9 +381,12 @@ public class Customer extends AbstractCustomer implements CustomerInfo { @QueryParam("query3") Integer[] queryString3Array, @QueryParam("query4") List queryString4, @QueryParam("query5") List queryString5, -@QueryParam("query3") List queryString6) { +@QueryParam("query3") List queryString6, +@QueryParam("query3") List queryString7, +@QueryParam("query3") List queryString8) { // complete } +//CHECKSTYLE:ON public static class MyType { private T t; public MyType(T t) { http://git-wip-us.apache.org/repos/asf/cxf/blob/21c1f81d/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java -- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java index 97a3be7..06138ea 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java @@ -873,8 +873,8 @@ public class JAXRSUtilsTest extends Assert { @SuppressWarnings("unchecked") @Test public void testQueryParamAsListWithDefaultValue() throws Exception { -Class[] argType = {List.class, List.class, List.class, Integer[].class, -List.class, List.class, List.class}; +Class[] argType = {List.class, List.class, List.class, Integer[].class, +List.class, List.class, List.class, List.class, List.class}; Method m = Customer.class.getMethod("testQueryAsList", argType); Message messageImpl = createMessage(); ProviderFactory.getInstance(messageImpl) @@ -885,7 +885,7 @@ public class JAXRSUtilsTest extends Assert { new ClassResourceInfo(Customer.class)), null, messageImpl); -assertEquals(7, params.size()); +assertEquals(9, params.size()); List queryList = (List)params.get(0); assertNotNull(queryList); assertEquals(1, queryList.size()); @@ -923,6 +923,18 @@ public class JAXRSUtilsTest extends Assert { assertEquals(2, queryList6.size()); assertEquals(Integer.valueOf(1), queryList6.get(0).get()); assertEquals(Integer.valueOf(2), queryList6.get(1).get()); + +List queryList7 = (List)params.get(7); +assertNotNull(queryList7); +assertEquals(2, queryList7.size()); +assertEquals(Long.valueOf(1), queryList7.get(0)); +assertEquals(Long.valueOf(2), queryList7.get(1)); + +List queryList8 = (List)params.get(8); +assertNotNull(queryList8); +assertEquals(2, queryList8.size()); +assertEquals(Double.valueOf(1),
cxf git commit: [CXF-7493] Adding a test
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes c47e3ae4c -> a6bd0f9c0 [CXF-7493] Adding a test Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a6bd0f9c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a6bd0f9c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a6bd0f9c Branch: refs/heads/3.1.x-fixes Commit: a6bd0f9c051f56ec01a59ec6029488e10c99a9fc Parents: c47e3ae Author: Sergey BeryozkinAuthored: Wed Sep 6 10:42:38 2017 +0100 Committer: Sergey Beryozkin Committed: Wed Sep 6 10:53:17 2017 +0100 -- .../test/java/org/apache/cxf/jaxrs/Customer.java | 10 +++--- .../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java| 18 +++--- 2 files changed, 22 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/a6bd0f9c/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java -- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java index f55fc1d..4d742ba 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java @@ -371,8 +371,9 @@ public class Customer extends AbstractCustomer implements CustomerInfo { public void testQueryIntArray(@QueryParam("query") int[] query) { // complete } - -@Produces("text/xml") + +@Produces("text/xml") +//CHECKSTYLE:OFF public void testQueryAsList( @DefaultValue("default") @QueryParam("query") List queryString, @QueryParam("query2") List queryString2, @@ -380,9 +381,12 @@ public class Customer extends AbstractCustomer implements CustomerInfo { @QueryParam("query3") Integer[] queryString3Array, @QueryParam("query4") List queryString4, @QueryParam("query5") List queryString5, -@QueryParam("query3") List queryString6) { +@QueryParam("query3") List queryString6, +@QueryParam("query3") List queryString7, +@QueryParam("query3") List queryString8) { // complete } +//CHECKSTYLE:ON public static class MyType { private T t; public MyType(T t) { http://git-wip-us.apache.org/repos/asf/cxf/blob/a6bd0f9c/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java -- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java index 04d5455..008fff9 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java @@ -895,8 +895,8 @@ public class JAXRSUtilsTest extends Assert { @SuppressWarnings("unchecked") @Test public void testQueryParamAsListWithDefaultValue() throws Exception { -Class[] argType = {List.class, List.class, List.class, Integer[].class, -List.class, List.class, List.class}; +Class[] argType = {List.class, List.class, List.class, Integer[].class, +List.class, List.class, List.class, List.class, List.class}; Method m = Customer.class.getMethod("testQueryAsList", argType); Message messageImpl = createMessage(); ProviderFactory.getInstance(messageImpl) @@ -907,7 +907,7 @@ public class JAXRSUtilsTest extends Assert { new ClassResourceInfo(Customer.class)), null, messageImpl); -assertEquals(7, params.size()); +assertEquals(9, params.size()); List queryList = (List)params.get(0); assertNotNull(queryList); assertEquals(1, queryList.size()); @@ -945,6 +945,18 @@ public class JAXRSUtilsTest extends Assert { assertEquals(2, queryList6.size()); assertEquals(Integer.valueOf(1), queryList6.get(0).get()); assertEquals(Integer.valueOf(2), queryList6.get(1).get()); + +List queryList7 = (List)params.get(7); +assertNotNull(queryList7); +assertEquals(2, queryList7.size()); +assertEquals(Long.valueOf(1), queryList7.get(0)); +assertEquals(Long.valueOf(2), queryList7.get(1)); + +List queryList8 = (List)params.get(8); +assertNotNull(queryList8); +assertEquals(2, queryList8.size()); +assertEquals(Double.valueOf(1),
cxf git commit: [CXF-7493] Adding a test
Repository: cxf Updated Branches: refs/heads/master 8c0d43fc9 -> 53479782d [CXF-7493] Adding a test Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/53479782 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/53479782 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/53479782 Branch: refs/heads/master Commit: 53479782d9acc56f3b88700941f0b33215661769 Parents: 8c0d43f Author: Sergey BeryozkinAuthored: Wed Sep 6 10:42:38 2017 +0100 Committer: Sergey Beryozkin Committed: Wed Sep 6 10:42:38 2017 +0100 -- .../test/java/org/apache/cxf/jaxrs/Customer.java| 6 +- .../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 16 ++-- 2 files changed, 19 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/53479782/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java -- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java index 54ed359..af7a545 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java @@ -373,6 +373,7 @@ public class Customer extends AbstractCustomer implements CustomerInfo { } @Produces("text/xml") +//CHECKSTYLE:OFF public void testQueryAsList( @DefaultValue("default") @QueryParam("query") List queryString, @QueryParam("query2") List queryString2, @@ -380,9 +381,12 @@ public class Customer extends AbstractCustomer implements CustomerInfo { @QueryParam("query3") Integer[] queryString3Array, @QueryParam("query4") List queryString4, @QueryParam("query5") List queryString5, -@QueryParam("query3") List queryString6) { +@QueryParam("query3") List queryString6, +@QueryParam("query3") List queryString7, +@QueryParam("query3") List queryString8) { // complete } +//CHECKSTYLE:ON public static class MyType { private T t; public MyType(T t) { http://git-wip-us.apache.org/repos/asf/cxf/blob/53479782/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java -- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java index f8ec86e..2db1313 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java @@ -895,7 +895,7 @@ public class JAXRSUtilsTest extends Assert { @Test public void testQueryParamAsListWithDefaultValue() throws Exception { Class[] argType = {List.class, List.class, List.class, Integer[].class, -List.class, List.class, List.class}; +List.class, List.class, List.class, List.class, List.class}; Method m = Customer.class.getMethod("testQueryAsList", argType); Message messageImpl = createMessage(); ProviderFactory.getInstance(messageImpl) @@ -906,7 +906,7 @@ public class JAXRSUtilsTest extends Assert { new ClassResourceInfo(Customer.class)), null, messageImpl); -assertEquals(7, params.size()); +assertEquals(9, params.size()); List queryList = (List)params.get(0); assertNotNull(queryList); assertEquals(1, queryList.size()); @@ -944,6 +944,18 @@ public class JAXRSUtilsTest extends Assert { assertEquals(2, queryList6.size()); assertEquals(Integer.valueOf(1), queryList6.get(0).get()); assertEquals(Integer.valueOf(2), queryList6.get(1).get()); + +List queryList7 = (List)params.get(7); +assertNotNull(queryList7); +assertEquals(2, queryList7.size()); +assertEquals(Long.valueOf(1), queryList7.get(0)); +assertEquals(Long.valueOf(2), queryList7.get(1)); + +List queryList8 = (List)params.get(8); +assertNotNull(queryList8); +assertEquals(2, queryList8.size()); +assertEquals(Double.valueOf(1), queryList8.get(0)); +assertEquals(Double.valueOf(2), queryList8.get(1)); } @Test
[2/2] cxf git commit: Recording .gitmergeinfo Changes
Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/582e3c06 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/582e3c06 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/582e3c06 Branch: refs/heads/3.0.x-fixes Commit: 582e3c065a44eaba8740d9cb05e1422dc21e939d Parents: 56c3765 Author: Colm O hEigeartaighAuthored: Wed Sep 6 10:22:06 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed Sep 6 10:22:06 2017 +0100 -- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/582e3c06/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 46cb533..ca3cac8 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -500,6 +500,7 @@ B 4306144c1704d2cf085d387cf0be8d9cbdd5f5b8 B 431db5275e3a056d6cedf4608533197580cb6073 B 432038214b8aba9afadb1d326ab057f867022ee2 B 432d9517952f9d14478bff8fb8e421266f82014d +B 4343b7c8c2115fa93983557e50da4d247e601ad4 B 434dd09df50479fea2408826bc04603cb8b8eb58 B 438919fe6972d7f1fa086e201a701ef9bcf7ea47 B 438eadb78176341f94a44ae3483b076332cf23a0 @@ -633,6 +634,7 @@ B 50e08ec3ade636a5d66eee5c1c41d7fb57df1c5f B 51247539e60d3db67df2556674f810b936a972e2 B 512e9e900f3c840e1b0ab4c2fb4c3950bffc84ad B 516f8cbe28b6fa73969bdcf96f447a675fafe023 +B 51db38c5d11ac39aad26895cb0c9b5012de885a6 B 51f433d54a1d11eac25c32b0dd69f12fef62c060 B 5250c5c85b8100236eb27734973ac0b496d59457 B 52c3b6a90314086ece3b7f6df63465434879b2cd
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes ae5c77c2f -> 582e3c065 Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/56c37658 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/56c37658 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/56c37658 Branch: refs/heads/3.0.x-fixes Commit: 56c376580469c6709912dd8692b696f5f0003d68 Parents: ae5c77c Author: Colm O hEigeartaighAuthored: Wed Sep 6 10:21:10 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed Sep 6 10:21:10 2017 +0100 -- .gitmergeinfo | 8 1 file changed, 8 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/56c37658/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 7f16534..46cb533 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -223,6 +223,7 @@ B 1e3093b07459e6d26fd9c0ebe5b4b7e4b575433d B 1e82efba0035a15afe84ada2d3fd0791733800a7 B 1e927cdfaafb2efc8d29184cb5b7b05ce3c3ad7f B 1f02b3d4f2c9d341046ce35222c8f4d7674b10b2 +B 1f07288dd3cd038135bd783ad371290beb6c73ce B 1f44b234594e60f9604959cd2859f3970d3d4360 B 1f61dfba75809a0b58dd0e6126acb0df9548945f B 1f692efcbd9fd53e2445b5a09d25df33df9e493d @@ -528,6 +529,7 @@ B 4586fe5b01c92a5353ff73bd0966d2a54329bb8b B 45a04b3ec3281ea04a06e0dfc88502d2f182f4b6 B 45bdda8482aa38509cf62283c159bce347894e24 B 45ca76a2502fe1a4f05e49c870035be0297d9142 +B 45ec20ade8eab419fcdcad43961944894419ae69 B 45f6dac04dc543371c9de1ac3fbd4260f7805dd6 B 46017d9a23bb46238c029fb21ca7a7ed4ea9e198 B 4604ca122a129ee311bbbfc041fbd48777f5354f @@ -536,6 +538,7 @@ B 464cb102e85d09b9c473c5eab60d53b579e24c87 B 46768c066208c5827783d29d0d3150e8004929fd B 46838d8a346687e9f8ff2f6e279e3ba83f99c5f3 B 468cb39200d7ef9cb4bcbbb379161a437c98618c +B 46bb02fe8243f1954aa1e2a6bcf9d08a3226f73b B 46ce1778d9a4d6a30e38b393a08dd4ecae2dbb09 B 46f0d5fff8a4d846831b5e9d7ac0405fe06d2ccd B 46fec2059cdd278b6dd9ad41307b5d758f96eddb @@ -1139,6 +1142,7 @@ B 97f9a50b457cd8aaa8c256d2a4481e4240fab39f B 985b824e0997d65aeb969330cd71b7f8b8b02f9d B 988caadb6f2eed12456dc576704d4b118c98995f B 9896b920035a1d1be1aef28a1d1a5eb876445c82 +B 98c61725f43a38a1bd8f426c139223271650daee B 997521186771645706fbee26e3c55094f17547e6 B 998b35ea20b1c37bd8b9dc3f4bc0396ee35a486a B 99963f9a08c9782b7c661f2b5ff8e9ce95ab3dbe @@ -1338,6 +1342,7 @@ B b19f59d369503a8676cb909e80af97e5814898a9 B b1b3fc2e1b4a0637d85bb67eb0a59abde91b0f9a B b1f19a1962d3791211ce83038e8641598c6f5ccf B b248d091551456c2fa8cfe0530dfdfc3632fe5e4 +B b283ae8cdeee75b2badd9073606297cae6210678 B b28a097a87c0f458d61a9b20f9e04f48ddd3c599 B b297eed6d676eb0e5ee3fa4f597d04e1fb9652ed B b2b0c2af76a5aa77ad5103a3c94afad856e3bbe6 @@ -1482,6 +1487,7 @@ B c3c74aa0cae75e09b5432f8e85ecc66616934fe4 B c3cca2d5d92576235e27692806d0c8233a8ce9b1 B c43c298801408fdf4fb7086341e96d66ecf51c0d B c4709d14fda1cb3510c1b6f3670bbaa678f81d8f +B c47e3ae4c54710def9e9901e660ab9ae36e8fe67 B c4901706c4067791de8d34101d7d6d53a756639d B c4a6faf0b8ba43143cdb96c8258a4b335f794b2d B c4c03e06de3ec8eb8b3e3b35a8c27d1615fd5931 @@ -1596,6 +1602,7 @@ B d4a25bbea9911b8c2debfab6724a3cc95532c4af B d4aa22c8dc000946ffb50e7e09156f1c22150e28 B d4bfacb8cc5ed8247ff74eb52061070c0457cbf3 B d4de0ced8b53599229a7a3e43ad3bb5cf70b401b +B d4e8a17cefd4768bfa95ce0b60990441b19e1a3c B d4ef04940f4757593e54611da024458e883b2116 B d4f3d88802137d285cc3290884c2683ba5e74d33 B d4f9674baa811936429271cbf64c4a558282c764 @@ -1689,6 +1696,7 @@ B e0572b477114a90f8bb48e6962463387bf3e09a4 B e0b56c9e6accb8fd7985cd33ca99391c3a8d76a1 B e0dd6d9741e21f5f1cf494b106d7ffdfa9ddbe93 B e0f8164c747d2120b882e565782aab0097290209 +B e108f2e6ec8705874f5f4a06d34c56fa8ec7a59a B e1246b3d0c00c9fe9489c0aacb683bf1de15d66b B e13ee941dd21570069230c61c828583e4f5ba40b B e1c2ff8bf93c05263584f34cde83ad9599a94cb2
[2/3] cxf git commit: Minor fix to last commit
Minor fix to last commit # Conflicts: # services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4343b7c8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4343b7c8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4343b7c8 Branch: refs/heads/3.1.x-fixes Commit: 4343b7c8c2115fa93983557e50da4d247e601ad4 Parents: 51db38c Author: Colm O hEigeartaighAuthored: Wed Sep 6 10:14:42 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed Sep 6 10:20:08 2017 +0100 -- .../java/org/apache/cxf/sts/operation/AbstractOperation.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/4343b7c8/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java -- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java index 53d7099..e72e526 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java @@ -186,10 +186,10 @@ public abstract class AbstractOperation { this.includeLifetimeElement = value; } -public boolean getIncludeLifetimeElement() { -return this.includeLifetimeElement; +public boolean isIncludeLifetimeElement() { +return includeLifetimeElement; } - + /** * Check the arguments from the STSProvider and parse the request. */
[1/3] cxf git commit: Added switch to disable the generation of a Lifetime element in a class derived from AbstractOperation. This closes #311.
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 46d5cebc9 -> c47e3ae4c Added switch to disable the generation of a Lifetime element in a class derived from AbstractOperation. This closes #311. Signed-off-by: Colm O hEigeartaigh# Conflicts: # services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java # services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java # services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java # services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/51db38c5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/51db38c5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/51db38c5 Branch: refs/heads/3.1.x-fixes Commit: 51db38c5d11ac39aad26895cb0c9b5012de885a6 Parents: 46d5ceb Author: val Authored: Tue Sep 5 00:53:26 2017 -0500 Committer: Colm O hEigeartaigh Committed: Wed Sep 6 10:19:53 2017 +0100 -- .../apache/cxf/sts/operation/AbstractOperation.java | 11 ++- .../apache/cxf/sts/operation/TokenIssueOperation.java | 13 - .../apache/cxf/sts/operation/TokenRenewOperation.java | 10 ++ .../cxf/sts/operation/TokenValidateOperation.java | 14 -- 4 files changed, 32 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/51db38c5/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java -- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java index 733d909..53d7099 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java @@ -104,7 +104,8 @@ public abstract class AbstractOperation { protected List delegationHandlers = new ArrayList<>(); protected TokenWrapper tokenWrapper = new DefaultTokenWrapper(); protected boolean allowCustomContent; - +protected boolean includeLifetimeElement = true; + public boolean isAllowCustomContent() { return allowCustomContent; } @@ -180,6 +181,14 @@ public abstract class AbstractOperation { public void setClaimsManager(ClaimsManager claimsManager) { this.claimsManager = claimsManager; } + +public void setIncludeLifetimeElement(boolean value) { +this.includeLifetimeElement = value; +} + +public boolean getIncludeLifetimeElement() { +return this.includeLifetimeElement; +} /** * Check the arguments from the STSProvider and parse the request. http://git-wip-us.apache.org/repos/asf/cxf/blob/51db38c5/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java -- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java index cffd284..5e9821d 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java @@ -75,7 +75,7 @@ import org.apache.xml.security.exceptions.XMLSecurityException; public class TokenIssueOperation extends AbstractOperation implements IssueOperation, IssueSingleOperation { static final Logger LOG = LogUtils.getL7dLogger(TokenIssueOperation.class); - + public RequestSecurityTokenResponseCollectionType issue( RequestSecurityTokenType request, @@ -354,10 +354,13 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera } // Lifetime -LifetimeType lifetime = -createLifetime(tokenResponse.getCreated(), tokenResponse.getExpires()); -JAXBElement lifetimeType = QNameConstants.WS_TRUST_FACTORY.createLifetime(lifetime); -response.getAny().add(lifetimeType); +if (includeLifetimeElement) { +LifetimeType lifetime = +createLifetime(tokenResponse.getCreated(), tokenResponse.getExpires()); +JAXBElement lifetimeType = +QNameConstants.WS_TRUST_FACTORY.createLifetime(lifetime); +response.getAny().add(lifetimeType); +} // KeySize long keySize =
[3/3] cxf git commit: Recording .gitmergeinfo Changes
Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c47e3ae4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c47e3ae4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c47e3ae4 Branch: refs/heads/3.1.x-fixes Commit: c47e3ae4c54710def9e9901e660ab9ae36e8fe67 Parents: 4343b7c Author: Colm O hEigeartaighAuthored: Wed Sep 6 10:20:09 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed Sep 6 10:20:09 2017 +0100 -- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/c47e3ae4/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 921db52..d8b8fa8 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -751,6 +751,7 @@ M 896f1abec915897967905762d6e850cfb6bac3bc M 8aebfa30047f32e3a6b4feb7ffdd89208ec4f435 M 8b5ad0005d5e42bb51a90c6773aae12c5022f78b M 8b78d8c82accc1f0beca55eef8d5bce87c7af792 +M 8c0d43fc9e995cd34541bf711cfb7d607deda377 M 8c6401b76ca76010e7e169656fd2f5fae6f3245a M 8c7b7bb3a6b86632d73da57b6567dd9bb4157f31 M 8dadf3defb43d13169943b191204be93da63c88b @@ -901,6 +902,7 @@ M f9a42a528f4edfa7bcc62d5885eebaeb25224cec M fa973bd7ab43099151f83beea351b80c7140eaab M fade9b81dabe27f864ca38e7b40f28fb44d6f165 M faf461150f178f7f7ae89a3b7c345671e53b8b04 +M fca2253915f5285a36360b48cb7e1b1c7a95982e M fd6689948bc7ad153ccfd7f64554eafbf64b20d6 M fe55813cc934667664863117921ff8ea08b9ff24 M fe89bf0fb8379428667f66312e6942e906142d6f
[2/2] cxf git commit: Minor fix to last commit
Minor fix to last commit Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8c0d43fc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8c0d43fc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8c0d43fc Branch: refs/heads/master Commit: 8c0d43fc9e995cd34541bf711cfb7d607deda377 Parents: fca2253 Author: Colm O hEigeartaighAuthored: Wed Sep 6 10:14:42 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed Sep 6 10:14:42 2017 +0100 -- .../java/org/apache/cxf/sts/operation/AbstractOperation.java| 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/8c0d43fc/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java -- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java index cd28309..15f229b 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java @@ -188,10 +188,9 @@ public abstract class AbstractOperation { this.includeLifetimeElement = value; } -public boolean getIncludeLifetimeElement() { -return this.includeLifetimeElement; +public boolean isIncludeLifetimeElement() { +return includeLifetimeElement; } - /** * Check the arguments from the STSProvider and parse the request.
[1/2] cxf git commit: Added switch to disable the generation of a Lifetime element in a class derived from AbstractOperation. This closes #311.
Repository: cxf Updated Branches: refs/heads/master e2a3839f6 -> 8c0d43fc9 Added switch to disable the generation of a Lifetime element in a class derived from AbstractOperation. This closes #311. Signed-off-by: Colm O hEigeartaighProject: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fca22539 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fca22539 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fca22539 Branch: refs/heads/master Commit: fca2253915f5285a36360b48cb7e1b1c7a95982e Parents: e2a3839 Author: val Authored: Tue Sep 5 00:53:26 2017 -0500 Committer: Colm O hEigeartaigh Committed: Wed Sep 6 10:14:08 2017 +0100 -- .../apache/cxf/sts/operation/AbstractOperation.java | 10 ++ .../apache/cxf/sts/operation/TokenIssueOperation.java | 14 +- .../apache/cxf/sts/operation/TokenRenewOperation.java | 10 ++ .../cxf/sts/operation/TokenValidateOperation.java | 12 +++- 4 files changed, 32 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/fca22539/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java -- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java index a64e722..cd28309 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java @@ -106,6 +106,7 @@ public abstract class AbstractOperation { protected List delegationHandlers = new ArrayList<>(); protected TokenWrapper tokenWrapper = new DefaultTokenWrapper(); protected boolean allowCustomContent; +protected boolean includeLifetimeElement = true; public boolean isAllowCustomContent() { return allowCustomContent; @@ -183,6 +184,15 @@ public abstract class AbstractOperation { this.claimsManager = claimsManager; } +public void setIncludeLifetimeElement(boolean value) { +this.includeLifetimeElement = value; +} + +public boolean getIncludeLifetimeElement() { +return this.includeLifetimeElement; +} + + /** * Check the arguments from the STSProvider and parse the request. */ http://git-wip-us.apache.org/repos/asf/cxf/blob/fca22539/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java -- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java index 496cf94..8e64bfd 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java @@ -75,7 +75,7 @@ import org.apache.xml.security.exceptions.XMLSecurityException; public class TokenIssueOperation extends AbstractOperation implements IssueOperation, IssueSingleOperation { static final Logger LOG = LogUtils.getL7dLogger(TokenIssueOperation.class); - + public RequestSecurityTokenResponseCollectionType issue( RequestSecurityTokenType request, @@ -89,6 +89,7 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera return responseCollection; } + public RequestSecurityTokenResponseCollectionType issue( RequestSecurityTokenCollectionType requestCollection, Principal principal, @@ -354,10 +355,13 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera } // Lifetime -LifetimeType lifetime = -createLifetime(tokenResponse.getCreated(), tokenResponse.getExpires()); -JAXBElement lifetimeType = QNameConstants.WS_TRUST_FACTORY.createLifetime(lifetime); -response.getAny().add(lifetimeType); +if (includeLifetimeElement) { +LifetimeType lifetime = +createLifetime(tokenResponse.getCreated(), tokenResponse.getExpires()); +JAXBElement lifetimeType = +QNameConstants.WS_TRUST_FACTORY.createLifetime(lifetime); +response.getAny().add(lifetimeType); +} // KeySize long keySize = tokenResponse.getKeySize(); http://git-wip-us.apache.org/repos/asf/cxf/blob/fca22539/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java