[cxf] branch master updated: [CXF-7715]EmptySOAPBodyTest fails on master with Java 9

2018-04-18 Thread ffang 
This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
 new 88bae9b  [CXF-7715]EmptySOAPBodyTest fails on master with Java 9
88bae9b is described below

commit 88bae9ba98b8e5e79c71414768f56485d801cd13
Author: Freeman Fang 
AuthorDate: Thu Apr 19 08:49:59 2018 +0800

[CXF-7715]EmptySOAPBodyTest fails on master with Java 9
---
 systests/uncategorized/pom.xml | 20 
 1 file changed, 20 insertions(+)

diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml
index 4084f33..a33be00 100644
--- a/systests/uncategorized/pom.xml
+++ b/systests/uncategorized/pom.xml
@@ -469,6 +469,26 @@
 
true
 
 
+
+copy-annotation
+validate
+
+copy
+
+
+
+
+javax.annotation
+
javax.annotation-api
+jar
+false
+
${project.basedir}/target/java9
+
+
+
false
+
true
+
+
 
 
 

-- 
To stop receiving notification emails like this one, please contact
ff...@apache.org.

[cxf] 03/04: Updating the poms so that the Java9 surefire configuration also applies to Java 10

2018-04-18 Thread coheigea 
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 9cce5c541813ad8e433c3fdb4717ed4be096bbd8
Author: Colm O hEigeartaigh 
AuthorDate: Wed Apr 18 17:45:15 2018 +0100

Updating the poms so that the Java9 surefire configuration also applies to 
Java 10
---
 integration/jca/pom.xml| 4 ++--
 maven-plugins/corba/pom.xml| 4 ++--
 maven-plugins/java2swagger-plugin/pom.xml  | 4 ++--
 rt/bindings/xml/pom.xml| 4 ++--
 rt/rs/client/pom.xml   | 4 ++--
 rt/rs/extensions/search/pom.xml| 4 ++--
 rt/rs/microprofile-client/pom.xml  | 4 ++--
 rt/rs/security/oauth-parent/oauth2/pom.xml | 4 ++--
 rt/rs/security/sso/oidc/pom.xml| 4 ++--
 rt/transports/jms/pom.xml  | 4 ++--
 services/wsn/wsn-core/pom.xml  | 4 ++--
 systests/cdi/cdi-owb/pom.xml   | 4 ++--
 systests/cdi/cdi-weld/pom.xml  | 4 ++--
 systests/jaxrs/pom.xml | 4 ++--
 systests/jaxws/pom.xml | 4 ++--
 systests/rs-http-sci/pom.xml   | 4 ++--
 systests/rs-security/pom.xml   | 4 ++--
 systests/rs-sse/pom.xml| 4 ++--
 systests/tracing/pom.xml   | 4 ++--
 systests/transport-jms/pom.xml | 4 ++--
 systests/transports/pom.xml| 4 ++--
 systests/uncategorized/pom.xml | 4 ++--
 systests/ws-specs/pom.xml  | 4 ++--
 23 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/integration/jca/pom.xml b/integration/jca/pom.xml
index ac9a739..8096170 100644
--- a/integration/jca/pom.xml
+++ b/integration/jca/pom.xml
@@ -112,9 +112,9 @@
 
 
 
-java9
+java9plus
 
-9
+[9,)
 
 
 
diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml
index 4792e90..a3d195a 100644
--- a/maven-plugins/corba/pom.xml
+++ b/maven-plugins/corba/pom.xml
@@ -71,9 +71,9 @@
 
 
 
-java9
+java9plus
 
-9
+[9,)
 
 
 
diff --git a/maven-plugins/java2swagger-plugin/pom.xml 
b/maven-plugins/java2swagger-plugin/pom.xml
index 809ebe3..d2a8549 100644
--- a/maven-plugins/java2swagger-plugin/pom.xml
+++ b/maven-plugins/java2swagger-plugin/pom.xml
@@ -233,9 +233,9 @@
 
 
 
-java9
+java9plus
 
-9
+[9,)
 
 
 
diff --git a/rt/bindings/xml/pom.xml b/rt/bindings/xml/pom.xml
index adea1d7..d62fe24 100644
--- a/rt/bindings/xml/pom.xml
+++ b/rt/bindings/xml/pom.xml
@@ -125,9 +125,9 @@
 
 
 
-java9
+java9plus
 
-9
+[9,)
 
 
 
diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml
index 2fb0faf..e21e57d 100644
--- a/rt/rs/client/pom.xml
+++ b/rt/rs/client/pom.xml
@@ -155,9 +155,9 @@
 
 
 
-java9
+java9plus
 
-9
+[9,)
 
 
 
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index 49b4e8f..7c005a2 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -155,9 +155,9 @@
 
 
 
-java9
+java9plus
 
-9
+[9,)
 
 
 
diff --git a/rt/rs/microprofile-client/pom.xml 
b/rt/rs/microprofile-client/pom.xml
index 5869b1a..dc1e8a3 100644
--- a/rt/rs/microprofile-client/pom.xml
+++ b/rt/rs/microprofile-client/pom.xml
@@ -169,9 +169,9 @@
 
 
 
-java9
+java9plus
 
-9
+[9,)
 
 
 
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml 
b/rt/rs/security/oauth-parent/oauth2/pom.xml
index 346ab60..9e48c92 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -273,12 +273,12 @@
   
   
 
-java9
+java9plus
 
 --patch-module 
java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${cxf.javax.annotation-api.version}.jar
 --add-modules java.se.ee,java.activation,java.xml.ws,java.xml.bind 
-Aopenjpa.source=7 -Aopenjpa.metamodel=true
 
 
-9
+[9,)
 
 
 
diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml
index

[cxf] 04/04: Switching to use valueOf instead of new Long/etc.

2018-04-18 Thread coheigea 
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit cffe1d0dd5aaf240f836496f9af1e9d3fdce25e4
Author: Colm O hEigeartaigh 
AuthorDate: Wed Apr 18 18:43:11 2018 +0100

Switching to use valueOf instead of new Long/etc.
---
 .../apache/cxf/performance/client/BenchClient.java |  8 ++---
 .../src/main/java/demo/jaxrs/server/Order.java |  2 +-
 .../src/main/java/demo/jaxrs/service/Order.java|  2 +-
 .../src/main/java/demo/jaxrs/server/Order.java |  2 +-
 .../src/main/java/demo/jaxrs/server/Order.java |  2 +-
 .../src/main/java/demo/jaxrs/server/Order.java |  2 +-
 .../main/java/demo/jms_greeter/client/Client.java  |  2 +-
 .../main/java/demo/hw/client/ComplexClient.java|  2 +-
 .../jca/cxf/ManagedConnectionFactoryImplTest.java  |  2 +-
 .../corba/runtime/CorbaObjectReaderTest.java   |  4 +--
 .../corba/runtime/CorbaObjectWriterTest.java   | 10 +++---
 .../corba/types/CorbaPrimitiveHandlerTest.java | 10 +++---
 .../apache/cxf/aegis/util/jdom/StaxBuilder.java| 40 +++---
 .../cxf/aegis/type/encoded/SoapArrayTypeTest.java  |  2 +-
 .../cxf/aegis/type/map/fortest/MapTestImpl.java|  2 +-
 .../org/apache/cxf/aegis/xml/stax/WriterTest.java  |  2 +-
 .../cxf/jaxb/io/XMLStreamDataReaderTest.java   |  2 +-
 .../java/org/apache/cxf/jaxrs/resources/Book.java  |  8 ++---
 .../cxf/jaxrs/resources/BookNoSubResource.java |  2 +-
 .../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 14 
 .../java/org/apache/cxf/javascript/AegisTest.java  |  2 +-
 .../org/apache/cxf/javascript/RPCClientTest.java   |  2 +-
 .../cxf/javascript/fortest/AegisServiceImpl.java   |  2 +-
 .../java/org/apache/cxf/jaxrs/resources/Book.java  |  8 ++---
 .../apache/cxf/jaxrs/openapi/JaxRs2Extension.java  |  4 +--
 .../apache/cxf/jaxrs/swagger/JaxRs2Extension.java  |  4 +--
 .../java/org/apache/cxf/jaxrs/resources/Book.java  |  6 ++--
 .../java/org/apache/cxf/jaxrs/ext/search/Book.java |  6 ++--
 .../cxf/ws/policy/EffectivePolicyImplTest.java |  2 +-
 .../PolicyInterceptorProviderRegistryImplTest.java |  2 +-
 .../apache/cxf/ws/rm/DestinationSequenceTest.java  | 38 ++--
 .../java/org/apache/cxf/ws/rm/RMManagerTest.java   |  8 ++---
 .../org/apache/cxf/ws/rm/RMOutInterceptorTest.java |  4 +--
 .../org/apache/cxf/ws/rm/SourceSequenceTest.java   | 24 ++---
 .../ws/rm/persistence/PersistenceUtilsTest.java|  4 +--
 .../ws/rm/persistence/jdbc/RMTxStoreTestBase.java  | 10 +++---
 .../apache/cxf/ws/rm/policy/PolicyUtilsTest.java   | 16 -
 .../cxf/ws/rm/soap/RMSoapInInterceptorTest.java|  4 +--
 .../cxf/ws/rm/soap/RMSoapOutInterceptorTest.java   |  4 +--
 .../ws/rm/soap/RetransmissionQueueImplTest.java|  2 +-
 .../cxf/ws/rm/soap/SoapFaultFactoryTest.java   |  4 +--
 .../cxf/systest/aegis/AegisClientServerTest.java   |  4 +--
 .../apache/cxf/systest/aegis/AegisJaxWsImpl.java   |  2 +-
 .../apache/cxf/systest/aegis/AegisJaxWsTest.java   |  4 +--
 .../apache/cxf/systest/aegis/AegisWSDLNSTest.java  |  2 +-
 .../java/org/apache/cxf/systest/jaxrs/Book.java|  8 ++---
 .../org/apache/cxf/systest/jaxrs/BookBean.java |  8 ++---
 .../cxf/systest/jaxrs/BookNoXmlRootElement.java|  8 ++---
 .../org/apache/cxf/systest/jaxrs/BookStore.java|  6 ++--
 .../org/apache/cxf/systest/jaxrs/BookType.java |  8 ++---
 .../test/java/org/apache/cxf/systest/jaxrs/CD.java |  2 +-
 .../jaxrs/JAXRSClientServerSpringBookTest.java |  2 +-
 .../cxf/systest/jaxrs/JAXRSSoapBookTest.java   | 14 
 .../systest/jaxrs/jaxws/BookStoreSoapRestImpl.java |  2 +-
 .../jaxrs/websocket/BookStoreWebSocket.java|  2 +-
 .../cxf/systest/http_undertow/websocket/Book.java  |  8 ++---
 .../websocket/BookStoreWebSocket.java  |  2 +-
 .../cxf/systest/exception/GenericsEchoImpl.java|  2 +-
 .../cxf/systest/lifecycle/LifeCycleTest.java   |  4 +--
 .../schema_validation/SchemaValidationImpl.java|  4 +--
 .../ValidationClientServerTest.java|  4 +--
 .../systest/type_test/AbstractTypeTestClient2.java | 28 +++
 .../systest/type_test/AbstractTypeTestClient3.java | 26 +++---
 .../systest/type_test/AbstractTypeTestClient4.java | 20 +--
 .../ws/rm/AbstractClientPersistenceTest.java   |  6 ++--
 .../ws/rm/AbstractServerPersistenceTest.java   |  2 +-
 .../cxf/systest/ws/rm/CachedOutMessageTest.java|  2 +-
 .../systest/ws/rm/DeliveryAssuranceOnewayTest.java | 12 +++
 .../systest/ws/rm/MessageCallbackOnewayTest.java   |  2 +-
 .../cxf/systest/ws/rm/RetransmissionGZIPTest.java  |  2 +-
 .../cxf/systest/ws/rm/RetransmissionQueueTest.java |  4 +--
 .../systest/ws/rm/RobustServiceAtMostOnceTest.java |  4 +--
 .../systest/ws/rm/RobustServiceWithFaultTest.java  |  4 +--
 .../org/apache/cxf/systest/ws/rm/SequenceTest.java | 12 +++

[cxf] 01/04: Don't run this test with Java 10 either

2018-04-18 Thread coheigea 
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 37a902307265dbe83dc6013a75bc6d9ed159ff85
Author: Colm O hEigeartaigh 
AuthorDate: Wed Apr 18 16:41:42 2018 +0100

Don't run this test with Java 10 either
---
 .../ws/security/wss4j/PolicyBasedWss4JInOutTest.java   | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java
 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java
index 6279178..6e8a015 100644
--- 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java
+++ 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java
@@ -414,11 +414,6 @@ public class PolicyBasedWss4JInOutTest extends 
AbstractPolicySecurityTest {
 
 @Test
 public void testEncryptedSignedPartsWithCompleteCoverage() throws 
Exception {
-if (System.getProperty("java.version").startsWith("9")) {
-//CXF-7270
-return;
-}
-
 this.runInInterceptorAndValidate(
 "encrypted_body_content_signed.xml",
 "encrypted_parts_policy_header_and_body_signed.xml",
@@ -435,7 +430,9 @@ public class PolicyBasedWss4JInOutTest extends 
AbstractPolicySecurityTest {
 null,
 Arrays.asList(CoverageType.ENCRYPTED, CoverageType.SIGNED));
 
-this.runAndValidate(
+if (!isJava9Compatible()) {
+// CXF-7270
+this.runAndValidate(
 "wsse-request-clean.xml",
 "encrypted_parts_policy_header_and_body_signed.xml",
 null,
@@ -445,6 +442,7 @@ public class PolicyBasedWss4JInOutTest extends 
AbstractPolicySecurityTest {
 null,
 Arrays.asList(CoverageType.ENCRYPTED,
 CoverageType.SIGNED));
+}
 }
 
 @Test
@@ -558,4 +556,12 @@ public class PolicyBasedWss4JInOutTest extends 
AbstractPolicySecurityTest {
 // TODO: Tests for derived keys.
 }
 
+private boolean isJava9Compatible() {
+String version = System.getProperty("java.version");
+if (version.indexOf(".") > 0) {
+version = version.substring(0, version.indexOf("."));
+}
+
+return Integer.valueOf(version) >= 9;
+}
 }

-- 
To stop receiving notification emails like this one, please contact
cohei...@apache.org.

[cxf] branch 3.1.x-fixes updated: Recording .gitmergeinfo Changes

2018-04-18 Thread coheigea 
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
 new 92710d5  Recording .gitmergeinfo Changes
92710d5 is described below

commit 92710d55f1416183869bc727607913aeb12ccd69
Author: Colm O hEigeartaigh 
AuthorDate: Wed Apr 18 18:43:56 2018 +0100

Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 4 
 1 file changed, 4 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7dc3624..04ce8ac 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -183,6 +183,7 @@ B 35e567b2cedbc87bef1cc4974cfff606a16ce01c
 B 35eaececdf71dc6a2581c0ada943350e9da35e58
 B 35f9fbdac1c8541915a7ace515d17d898758c251
 B 36ca8b05d55779971e4ecb681122ed610f9d5bf9
+B 37a902307265dbe83dc6013a75bc6d9ed159ff85
 B 38919f57bfb2b880691950fc5f992b5649ea579e
 B 38c08dde6ed3d2d4096f5702a6a84324432c38be
 B 390231e777ef697e4442464d6ee6556051dcfd75
@@ -401,6 +402,7 @@ B 7b175a5708571f993f592e0c25a5a054c1984bfb
 B 7b7629682d15345518e66d46e575bf1ac334cf00
 B 7b8184c9772834053d33cb39d809652a339225f6
 B 7c191d4d590a5ef621a0dd5adfff59512c91daf3
+B 7c42380ce3bf1ccaf0ef06ec05b79055517460c5
 B 7d207e00ed3001132e9013997f876d949d4718e4
 B 7d344ae7ed882a4347d0f8775744646e0013aca5
 B 7dbce543a96c6ec1c6f02ab0530146c3507fa205
@@ -488,6 +490,7 @@ B 9bb1148e093b5293454cd978673f5526443d1f55
 B 9bcde744c2ad59a67c278d155f2ba22e35bacb7d
 B 9c7ccd5cc10b1d4a6f1817a6c37c99b8f19d15a1
 B 9cc3f37d15778604463d03e609e09b46bd2b7b5c
+B 9cce5c541813ad8e433c3fdb4717ed4be096bbd8
 B 9cffee539adc2abd5eaf198e16fde082ca4b3e92
 B 9e6d2aa86c57e600baf66e42538036c927cadcf5
 B 9e9da1ec63f5c30d99ceb6cd662fe89b789447dd
@@ -649,6 +652,7 @@ B cf863bdf389aea0cf249491ef48de4bf9d68b846
 B cf9ab27a843df4532d9bd78209aebcafee2c
 B cfa4e9274e8912aa9a74f7f6e644dda8d16ddd07
 B cfdd0d36c31d119d5846ccfdd623ab072c8a7682
+B cffe1d0dd5aaf240f836496f9af1e9d3fdce25e4
 B d017d3cf4165e9d8fa849e29669cece562f55253
 B d05916a301a0b1fd80085cea9e74ea82ca2845be
 B d0dd55e901a83c1a4a014552a7da58f3899cd638

-- 
To stop receiving notification emails like this one, please contact
cohei...@apache.org.

[cxf] branch master updated (cab75e1 -> cffe1d0)

2018-04-18 Thread coheigea 
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.


from cab75e1  [CXF-7711] enable JavaToWS to use custom compiler
 new 37a9023  Don't run this test with Java 10 either
 new 7c42380  Fixing compilation error with Java 10
 new 9cce5c5  Updating the poms so that the Java9 surefire configuration 
also applies to Java 10
 new cffe1d0  Switching to use valueOf instead of new Long/etc.

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/cxf/performance/client/BenchClient.java |  8 ++---
 .../src/main/java/demo/jaxrs/server/Order.java |  2 +-
 .../src/main/java/demo/jaxrs/service/Order.java|  2 +-
 .../src/main/java/demo/jaxrs/server/Order.java |  2 +-
 .../src/main/java/demo/jaxrs/server/Order.java |  2 +-
 .../src/main/java/demo/jaxrs/server/Order.java |  2 +-
 .../main/java/demo/jms_greeter/client/Client.java  |  2 +-
 .../main/java/demo/hw/client/ComplexClient.java|  2 +-
 integration/jca/pom.xml|  4 +--
 .../jca/cxf/ManagedConnectionFactoryImplTest.java  |  2 +-
 maven-plugins/corba/pom.xml|  4 +--
 maven-plugins/java2swagger-plugin/pom.xml  |  4 +--
 .../corba/runtime/CorbaObjectReaderTest.java   |  4 +--
 .../corba/runtime/CorbaObjectWriterTest.java   | 10 +++---
 .../corba/types/CorbaPrimitiveHandlerTest.java | 10 +++---
 rt/bindings/xml/pom.xml|  4 +--
 .../apache/cxf/aegis/util/jdom/StaxBuilder.java| 40 +++---
 .../cxf/aegis/type/encoded/SoapArrayTypeTest.java  |  2 +-
 .../cxf/aegis/type/map/fortest/MapTestImpl.java|  2 +-
 .../org/apache/cxf/aegis/xml/stax/WriterTest.java  |  2 +-
 .../cxf/jaxb/io/XMLStreamDataReaderTest.java   |  2 +-
 .../org/apache/cxf/jaxrs/ext/xml/XMLSource.java|  2 +-
 .../java/org/apache/cxf/jaxrs/resources/Book.java  |  8 ++---
 .../cxf/jaxrs/resources/BookNoSubResource.java |  2 +-
 .../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 14 
 .../java/org/apache/cxf/javascript/AegisTest.java  |  2 +-
 .../org/apache/cxf/javascript/RPCClientTest.java   |  2 +-
 .../cxf/javascript/fortest/AegisServiceImpl.java   |  2 +-
 rt/rs/client/pom.xml   |  4 +--
 .../java/org/apache/cxf/jaxrs/resources/Book.java  |  8 ++---
 .../apache/cxf/jaxrs/openapi/JaxRs2Extension.java  |  4 +--
 .../apache/cxf/jaxrs/swagger/JaxRs2Extension.java  |  4 +--
 .../cxf/jaxrs/provider/json/utils/JSONUtils.java   |  2 +-
 .../java/org/apache/cxf/jaxrs/resources/Book.java  |  6 ++--
 rt/rs/extensions/search/pom.xml|  4 +--
 .../java/org/apache/cxf/jaxrs/ext/search/Book.java |  6 ++--
 rt/rs/microprofile-client/pom.xml  |  4 +--
 rt/rs/security/oauth-parent/oauth2/pom.xml |  4 +--
 rt/rs/security/sso/oidc/pom.xml|  4 +--
 rt/transports/jms/pom.xml  |  4 +--
 .../cxf/ws/policy/EffectivePolicyImplTest.java |  2 +-
 .../PolicyInterceptorProviderRegistryImplTest.java |  2 +-
 .../apache/cxf/ws/rm/DestinationSequenceTest.java  | 38 ++--
 .../java/org/apache/cxf/ws/rm/RMManagerTest.java   |  8 ++---
 .../org/apache/cxf/ws/rm/RMOutInterceptorTest.java |  4 +--
 .../org/apache/cxf/ws/rm/SourceSequenceTest.java   | 24 ++---
 .../ws/rm/persistence/PersistenceUtilsTest.java|  4 +--
 .../ws/rm/persistence/jdbc/RMTxStoreTestBase.java  | 10 +++---
 .../apache/cxf/ws/rm/policy/PolicyUtilsTest.java   | 16 -
 .../cxf/ws/rm/soap/RMSoapInInterceptorTest.java|  4 +--
 .../cxf/ws/rm/soap/RMSoapOutInterceptorTest.java   |  4 +--
 .../ws/rm/soap/RetransmissionQueueImplTest.java|  2 +-
 .../cxf/ws/rm/soap/SoapFaultFactoryTest.java   |  4 +--
 .../security/wss4j/PolicyBasedWss4JInOutTest.java  | 18 ++
 services/wsn/wsn-core/pom.xml  |  4 +--
 systests/cdi/cdi-owb/pom.xml   |  4 +--
 systests/cdi/cdi-weld/pom.xml  |  4 +--
 .../cxf/systest/aegis/AegisClientServerTest.java   |  4 +--
 .../apache/cxf/systest/aegis/AegisJaxWsImpl.java   |  2 +-
 .../apache/cxf/systest/aegis/AegisJaxWsTest.java   |  4 +--
 .../apache/cxf/systest/aegis/AegisWSDLNSTest.java  |  2 +-
 systests/jaxrs/pom.xml |  4 +--
 .../java/org/apache/cxf/systest/jaxrs/Book.java|  8 ++---
 .../org/apache/cxf/systest/jaxrs/BookBean.java |  8 ++---
 .../cxf/systest/jaxrs/BookNoXmlRootElement.java|  8 ++---
 .../org/apache/cxf/systest/jaxrs/BookStore.java|  6 ++--
 .../org/apache/cxf/systest/jaxrs/BookType.java |  8 ++---
 .../test/java/org/apache/cxf/systest/jaxrs/CD.java |  2 +-

[cxf] 02/04: Fixing compilation error with Java 10

2018-04-18 Thread coheigea 
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 7c42380ce3bf1ccaf0ef06ec05b79055517460c5
Author: Colm O hEigeartaigh 
AuthorDate: Wed Apr 18 16:49:34 2018 +0100

Fixing compilation error with Java 10
---
 .../jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java | 2 +-
 .../main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java   | 2 +-
 .../tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
index d5ea6f2..db4cf4f 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
@@ -334,7 +334,7 @@ public class XMLSource {
 return null;
 }
 
-public Iterator getPrefixes(String namespace) {
+public Iterator getPrefixes(String namespace) {
 String prefix = namespaces.get(namespace);
 if (prefix == null) {
 return null;
diff --git 
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
 
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
index d0c1f06..1e43d2c 100644
--- 
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
+++ 
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
@@ -217,7 +217,7 @@ public final class JSONUtils {
 return namespaceMap.get(ns);
 }
 
-public Iterator getPrefixes(String ns) {
+public Iterator getPrefixes(String ns) {
 String prefix = getPrefix(ns);
 return prefix == null ? null : 
Collections.singletonList(prefix).iterator();
 }
diff --git 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
index adb4421..64201eb 100644
--- 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
+++ 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
@@ -248,7 +248,7 @@ public class JAXWSBindingParser {
 throw new UnsupportedOperationException();
 }
 
-public Iterator getPrefixes(String namespaceURI) {
+public Iterator getPrefixes(String namespaceURI) {
 throw new UnsupportedOperationException();
 }
 }

-- 
To stop receiving notification emails like this one, please contact
cohei...@apache.org.

[cxf] branch master updated: [CXF-7711] enable JavaToWS to use custom compiler

2018-04-18 Thread asoldano 
This is an automated email from the ASF dual-hosted git repository.

asoldano pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
 new cab75e1  [CXF-7711] enable JavaToWS to use custom compiler
cab75e1 is described below

commit cab75e1a9651b69187bfe217b6404f4d1a3e01b7
Author: rsearls 
AuthorDate: Tue Apr 17 16:02:02 2018 -0400

[CXF-7711] enable JavaToWS to use custom compiler
---
 .../src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java | 12 
 .../java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java |  6 ++
 .../cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java  |  5 -
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git 
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java 
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java
index 22df372..ed9f7a0 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java
@@ -24,6 +24,7 @@ import java.util.List;
 
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.tools.common.CommandInterfaceUtils;
+import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.common.toolspec.ToolRunner;
 
 public class JavaToWS {
@@ -84,6 +85,17 @@ public class JavaToWS {
.getResourceAsStream("java2ws.xml"), false, args, 
os);
 }
 
+/**
+ * Pass user app's (compiler) information in the context.
+ * @param context
+ * @param os
+ * @throws Exception
+ */
+public void run(ToolContext context, OutputStream os) throws Exception {
+ToolRunner.runTool(JavaToWSContainer.class,
+JavaToWSContainer.class.getResourceAsStream("java2ws.xml"),
+false, args, isExitOnFinish(), context, os);
+}
 
 private boolean isExitOnFinish() {
 String exit = System.getProperty("exitOnFinish");
diff --git 
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java
 
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java
index 08366b9..08a1d5c 100644
--- 
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java
+++ 
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java
@@ -52,6 +52,12 @@ public class JavaToWSContainer extends 
AbstractCXFToolContainer {
 if (!hasInfoOption()) {
 ToolContext env = new ToolContext();
 env.setParameters(getParametersMap(new HashSet<>()));
+
+// check for custom compiler object to pass on
+if (getContext() != null && 
getContext().get(ToolConstants.COMPILER) != null) {
+env.put(ToolConstants.COMPILER, 
getContext().get(ToolConstants.COMPILER));
+}
+
 if (env.get(ToolConstants.CFG_OUTPUTDIR) == null) {
 env.put(ToolConstants.CFG_OUTPUTDIR, ".");
 }
diff --git 
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java
 
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java
index 3df2ee2..49e4d2f 100644
--- 
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java
+++ 
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java
@@ -82,7 +82,10 @@ public class BeanGenerator extends AbstractGenerator {
 }
 
 //compile the classes
-Compiler compiler = new Compiler();
+Compiler compiler = 
(Compiler)getToolContext().get(ToolConstants.COMPILER);
+if (compiler == null) {
+compiler = new Compiler();
+}
 compiler.setOutputDir(compileToDir);
 List files = new ArrayList<>(generatedFiles.size());
 for (File file : generatedFiles) {

-- 
To stop receiving notification emails like this one, please contact
asold...@apache.org.

[cxf] branch master updated: [CXF-7714] disable jdk-cxf-with-toolchain test for now

2018-04-18 Thread deki 
This is an automated email from the ASF dual-hosted git repository.

deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
 new 9256a48  [CXF-7714] disable jdk-cxf-with-toolchain test for now
9256a48 is described below

commit 9256a48a2f0ef2831f700fd145d8136110543b95
Author: Dennis Kieselhorst 
AuthorDate: Wed Apr 18 15:13:49 2018 +0200

[CXF-7714] disable jdk-cxf-with-toolchain test for now
---
 maven-plugins/codegen-plugin/pom.xml   | 2 ++
 maven-plugins/codegen-plugin/src/it/README.md  | 2 ++
 maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/maven-plugins/codegen-plugin/pom.xml 
b/maven-plugins/codegen-plugin/pom.xml
index 1849732..907a543 100644
--- a/maven-plugins/codegen-plugin/pom.xml
+++ b/maven-plugins/codegen-plugin/pom.xml
@@ -185,6 +185,8 @@
 
 src/it/settings.xml
 
${project.build.directory}/it
+
+!jdk-cxf-with-toolchain
 
 
 
diff --git a/maven-plugins/codegen-plugin/src/it/README.md 
b/maven-plugins/codegen-plugin/src/it/README.md
index b3727dc..1beb93a 100644
--- a/maven-plugins/codegen-plugin/src/it/README.md
+++ b/maven-plugins/codegen-plugin/src/it/README.md
@@ -4,6 +4,8 @@ toolchain-integration-tests
 jdk-cxf-with-toolchain
 ---
 
+Currently disabled due to https://issues.apache.org/jira/browse/CXF-7714
+
 This project contains sample maven module using `cxf-codegen-plugin` to 
generate java from WSDL file.
 
 - it enforces usage of JDK 1.9 or higher to run the `mvn` command
diff --git a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml 
b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
index 778eefc..2b6bf20 100644
--- a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
@@ -3,7 +3,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
   4.0.0
   org.apache.cxf.it
-  jdk6-cxf-with-toolchain
+  jdk-cxf-with-toolchain
   1.0-SNAPSHOT
   jar
   

-- 
To stop receiving notification emails like this one, please contact
d...@apache.org.

[cxf-xjc-utils] branch master updated: Updating Apache parent version

2018-04-18 Thread coheigea 
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git


The following commit(s) were added to refs/heads/master by this push:
 new c9eae9f  Updating Apache parent version
c9eae9f is described below

commit c9eae9fa5b1446982d699221c186a9826a9a7341
Author: Colm O hEigeartaigh 
AuthorDate: Wed Apr 18 11:56:38 2018 +0100

Updating Apache parent version
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d2de361..7c480e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
 org.apache
 apache
-18
+19
 
 
   
scm:git:https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git

-- 
To stop receiving notification emails like this one, please contact
cohei...@apache.org.

[cxf-build-utils] branch master updated: Updating Apache parent version

2018-04-18 Thread coheigea 
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-build-utils.git


The following commit(s) were added to refs/heads/master by this push:
 new 33d65fb  Updating Apache parent version
33d65fb is described below

commit 33d65fb46ca7fb36e2c025753372bbda4339acca
Author: Colm O hEigeartaigh 
AuthorDate: Wed Apr 18 11:56:23 2018 +0100

Updating Apache parent version
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 45326dd..d47bd3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
 org.apache
 apache
-17
+19
 
 
 4.0.0

-- 
To stop receiving notification emails like this one, please contact
cohei...@apache.org.

[cxf] branch master updated: Reverting to swagger-jaxrs 2.0.0

2018-04-18 Thread ilgrosso 
This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
 new 3567841  Reverting to swagger-jaxrs 2.0.0
3567841 is described below

commit 3567841e2449ff62dd3517b7c64134a587e02d64
Author: Francesco Chicchiriccò 
AuthorDate: Wed Apr 18 11:06:37 2018 +0200

Reverting to swagger-jaxrs 2.0.0
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 1efd1f4..d956a2b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -160,7 +160,7 @@
 2.3.2.RELEASE
 spring-test
 1.5.17
-2.0.1
+2.0.0
 3.13.3
 2.0
 5.0.3

-- 
To stop receiving notification emails like this one, please contact
ilgro...@apache.org.

[cxf] branch master updated (96cf54c -> e70db46)

2018-04-18 Thread deki 
This is an automated email from the ASF dual-hosted git repository.

deki pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.


from 96cf54c  Upgrade swagger-jaxrs2
 new 208cf86  fixed JDK version and README
 new e70db46  added maven-compiler-plugin config to fix build on Jenkins

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 maven-plugins/codegen-plugin/src/it/README.md | 6 +++---
 .../codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml  | 2 +-
 .../codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml| 8 
 3 files changed, 12 insertions(+), 4 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
d...@apache.org.

[cxf] 02/02: added maven-compiler-plugin config to fix build on Jenkins

2018-04-18 Thread deki 
This is an automated email from the ASF dual-hosted git repository.

deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit e70db46256f5d7c8ff047189dc4dc1b4d9882de8
Author: Dennis Kieselhorst 
AuthorDate: Wed Apr 18 11:06:04 2018 +0200

added maven-compiler-plugin config to fix build on Jenkins
---
 .../codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml| 8 
 1 file changed, 8 insertions(+)

diff --git 
a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml 
b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
index 4c93c94..fd53823 100644
--- a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
@@ -35,6 +35,14 @@
 
 
 
+maven-compiler-plugin
+3.7.0
+
+1.8
+1.8
+
+
+
 org.apache.cxf
 cxf-codegen-plugin
 @project.version@

-- 
To stop receiving notification emails like this one, please contact
d...@apache.org.

[cxf] 01/02: fixed JDK version and README

2018-04-18 Thread deki 
This is an automated email from the ASF dual-hosted git repository.

deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 208cf86e1b9066559d97f10bc4b05e81859263c9
Author: Dennis Kieselhorst 
AuthorDate: Wed Apr 18 11:01:27 2018 +0200

fixed JDK version and README
---
 maven-plugins/codegen-plugin/src/it/README.md  | 6 +++---
 maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/maven-plugins/codegen-plugin/src/it/README.md 
b/maven-plugins/codegen-plugin/src/it/README.md
index f42b169..b3727dc 100644
--- a/maven-plugins/codegen-plugin/src/it/README.md
+++ b/maven-plugins/codegen-plugin/src/it/README.md
@@ -1,13 +1,13 @@
 toolchain-integration-tests
 ===
 
-jdk6-cxf-with-toolchain
+jdk-cxf-with-toolchain
 ---
 
 This project contains sample maven module using `cxf-codegen-plugin` to 
generate java from WSDL file.
 
-- it enforces usage of JDK 1.7 or higher to run the `mvn` command
-- it configures `maven-toolchains-plugins` to target JDK 6
+- it enforces usage of JDK 1.9 or higher to run the `mvn` command
+- it configures `maven-toolchains-plugins` to target JDK 8
 - cxf `fork` parameter if set to true to enable toolchain detection
 - if the toolchain wasn't correctly used by the cxf-codegen-plugin`, the the 
build should fail during the _compile_ phase
 
diff --git a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml 
b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
index ffc14b6..778eefc 100644
--- a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
@@ -93,7 +93,7 @@
 
   
 
-  8
+  1.8
 
   
 

-- 
To stop receiving notification emails like this one, please contact
d...@apache.org.

[cxf] branch master updated: Upgrade swagger-jaxrs2

2018-04-18 Thread ilgrosso 
This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
 new 96cf54c  Upgrade swagger-jaxrs2
96cf54c is described below

commit 96cf54c8577abb504113065c7c8f4e3d86b84bf9
Author: Francesco Chicchiriccò 
AuthorDate: Wed Apr 18 10:23:31 2018 +0200

Upgrade swagger-jaxrs2
---
 parent/pom.xml   | 2 +-
 .../description/openapi/AbstractOpenApiServiceDescriptionTest.java   | 5 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index d956a2b..1efd1f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -160,7 +160,7 @@
 2.3.2.RELEASE
 spring-test
 1.5.17
-2.0.0
+2.0.1
 3.13.3
 2.0
 5.0.3
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java
index 0e8654f..d81ff8a 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java
@@ -160,10 +160,7 @@ public abstract class 
AbstractOpenApiServiceDescriptionTest extends AbstractBusC
 UserOperation getBooksOp = map.get("getBooks");
 assertEquals(HttpMethod.GET, getBooksOp.getVerb());
 assertEquals(getApplicationPath() + "/bookstore", 
getBooksOp.getPath());
-// see https://github.com/swagger-api/swagger-core/issues/2646
-if (getBooksOp.getProduces() != null) {
-assertEquals(MediaType.APPLICATION_JSON, 
getBooksOp.getProduces());
-}
+assertEquals(MediaType.APPLICATION_JSON, getBooksOp.getProduces());
 List getBooksOpParams = getBooksOp.getParameters();
 assertEquals(1, getBooksOpParams.size());
 assertEquals(ParameterType.QUERY, 
getBooksOpParams.get(0).getType());

-- 
To stop receiving notification emails like this one, please contact
ilgro...@apache.org.

[cxf-xjc-utils] branch master updated: [CXFXJC-25]cxf-xjc-plugin can't load xjc plugin extensions which is already on the classpath with jax-xjc 2.3.0

2018-04-18 Thread ffang 
This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git


The following commit(s) were added to refs/heads/master by this push:
 new 345186f  [CXFXJC-25]cxf-xjc-plugin can't load xjc plugin extensions 
which is already on the classpath with jax-xjc 2.3.0
345186f is described below

commit 345186ff320d5adae7ac0dfacdc423e39e93a798
Author: Freeman Fang 
AuthorDate: Wed Apr 18 15:39:14 2018 +0800

[CXFXJC-25]cxf-xjc-plugin can't load xjc plugin extensions which is already 
on the classpath with jax-xjc 2.3.0
---
 .../java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git 
a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java 
b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
index 7ca2f2f..3df23e0 100644
--- 
a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
+++ 
b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
@@ -157,6 +157,7 @@ public class XSDToJavaRunner {
 catResolver.getCatalog().parseCatalog(catalogFile.getPath());
 }
 };
+
 for (URL url : urls) {
 opt.classpaths.add(url);
 }
@@ -164,7 +165,15 @@ public class XSDToJavaRunner {
 opt.target = SpecVersion.V2_1;
 }
 opt.setSchemaLanguage(Language.XMLSCHEMA);
-opt.parseArguments(args);
+// set up the context class loader so that the user-specified plugin
+// on classpath can be loaded from there with jaxb-xjc 2.3.0
+ClassLoader origLoader = 
Thread.currentThread().getContextClassLoader();
+try {
+
Thread.currentThread().setContextClassLoader(opt.getUserClassLoader(origLoader));
+opt.parseArguments(args);
+} finally {
+Thread.currentThread().setContextClassLoader(origLoader);
+}
 Model model = loadModel(opt); 
 if (model == null) {
 listener.message(xsdFile, "Failed to create model");

-- 
To stop receiving notification emails like this one, please contact
ff...@apache.org.

[cxf] 01/02: verify results of codegen tests (in the past the build was also successful in case of test failures)

2018-04-18 Thread deki 
This is an automated email from the ASF dual-hosted git repository.

deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 8a6d14d79657d7b8fd45dcc9539895c4fd6c51ec
Author: Dennis Kieselhorst 
AuthorDate: Wed Apr 18 08:41:22 2018 +0200

verify results of codegen tests (in the past the build was also successful 
in case of test failures)
---
 maven-plugins/codegen-plugin/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/maven-plugins/codegen-plugin/pom.xml 
b/maven-plugins/codegen-plugin/pom.xml
index 5c7331e..1849732 100644
--- a/maven-plugins/codegen-plugin/pom.xml
+++ b/maven-plugins/codegen-plugin/pom.xml
@@ -173,13 +173,14 @@
 
 org.apache.maven.plugins
 maven-invoker-plugin
-3.0.0
+3.0.1
 
 
 test-integration
 integration-test
 
 integration-test
+verify
 
 
 src/it/settings.xml

-- 
To stop receiving notification emails like this one, please contact
d...@apache.org.

[cxf] branch master updated (1f7bcc7 -> 7f83224)

2018-04-18 Thread deki 
This is an automated email from the ASF dual-hosted git repository.

deki pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.


from 1f7bcc7  replaced JDK 6.0 with a more generic term
 new 8a6d14d  verify results of codegen tests (in the past the build was 
also successful in case of test failures)
 new 7f83224  a JDK6 testcase is no longer valid for 3.2.x, changed to JDK8 
in combination with JDK9 only runs on Jenkins to avoid failures for local 
developers without toolchain config

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 maven-plugins/codegen-plugin/pom.xml   |  3 +-
 .../pom.xml| 57 ++
 .../src/main/wsdl/HelloWorld.wsdl  |  0
 3 files changed, 38 insertions(+), 22 deletions(-)
 rename maven-plugins/codegen-plugin/src/it/{jdk6-cxf-with-toolchain => 
jdk-cxf-with-toolchain}/pom.xml (69%)
 rename maven-plugins/codegen-plugin/src/it/{jdk6-cxf-with-toolchain => 
jdk-cxf-with-toolchain}/src/main/wsdl/HelloWorld.wsdl (100%)

-- 
To stop receiving notification emails like this one, please contact
d...@apache.org.

[cxf] 02/02: a JDK6 testcase is no longer valid for 3.2.x, changed to JDK8 in combination with JDK9 only runs on Jenkins to avoid failures for local developers without toolchain config

2018-04-18 Thread deki 
This is an automated email from the ASF dual-hosted git repository.

deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 7f832241fb357fe8e4e1199775ff30c83d7a89f3
Author: Dennis Kieselhorst 
AuthorDate: Wed Apr 18 08:51:51 2018 +0200

a JDK6 testcase is no longer valid for 3.2.x, changed to JDK8 in 
combination with JDK9
only runs on Jenkins to avoid failures for local developers without 
toolchain config
---
 .../pom.xml| 57 ++
 .../src/main/wsdl/HelloWorld.wsdl  |  0
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git 
a/maven-plugins/codegen-plugin/src/it/jdk6-cxf-with-toolchain/pom.xml 
b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
similarity index 69%
rename from maven-plugins/codegen-plugin/src/it/jdk6-cxf-with-toolchain/pom.xml
rename to maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
index 1dd949f..ffc14b6 100644
--- a/maven-plugins/codegen-plugin/src/it/jdk6-cxf-with-toolchain/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
@@ -17,7 +17,7 @@
 1.4
 
   
-enforce-jdk7-of-higher
+enforce-jdk9-of-higher
 verify
 
   enforce
@@ -25,7 +25,7 @@
 
   
 
-  [1.7,)
+  [1.9,)
 
   
 
@@ -33,25 +33,6 @@
 
   
   
-org.apache.maven.plugins
-maven-toolchains-plugin
-1.1
-
-  
-
-  6
-
-  
-
-
-  
-
-  toolchain
-
-  
-
-  
-  
 org.apache.cxf
 cxf-codegen-plugin
 @project.version@
@@ -94,4 +75,38 @@
   
 
   
+  
+
+  toolchain
+  
+[9,)
+
+  env.BUILD_NUMBER
+
+  
+  
+
+  
+org.apache.maven.plugins
+maven-toolchains-plugin
+1.1
+
+  
+
+  8
+
+  
+
+
+  
+
+  toolchain
+
+  
+
+  
+
+  
+
+  
 
diff --git 
a/maven-plugins/codegen-plugin/src/it/jdk6-cxf-with-toolchain/src/main/wsdl/HelloWorld.wsdl
 
b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/src/main/wsdl/HelloWorld.wsdl
similarity index 100%
rename from 
maven-plugins/codegen-plugin/src/it/jdk6-cxf-with-toolchain/src/main/wsdl/HelloWorld.wsdl
rename to 
maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/src/main/wsdl/HelloWorld.wsdl

-- 
To stop receiving notification emails like this one, please contact
d...@apache.org.