You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/10/05 17:18:49 UTC
[cxf] branch 3.2.x-fixes updated (01f26d2 -> 0b3a4fe)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 01f26d2 Recording .gitmergeinfo Changes
new 3dbfe40 Attempt to fix toolchain JDK version for Jenkins builds
new 712d145 Attempt to fix toolchain JDK version for Jenkins builds
new af955fc Attempt to fix toolchain JDK version for Jenkins builds (JDK10 is OK, JDK9 still failing)
new 9dfb06c Recording .gitmergeinfo Changes
new 2ca662c CXF-7784: Adding test case for concurrent invocations of the Invocation.Builder instance
new a8b2d9b update some maven plugins
new a92f6b0 Attempt to fix Maven build failure: An API incompatibility was encountered while executing org.apache.maven.plugins:maven-pmd-plugin:3.10.0:pmd
new 1ff9765 update commons-lang3
new b811992 Fix a bunch of compiler warnings
new b613bd1 Fix checkstyle with latest eclipse plugin
new d6e75a4 Recording .gitmergeinfo Changes
new 0b3a4fe Recording .gitmergeinfo Changes
The 12 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:
.gitmergeinfo | 21 +++++++++
.../java/org/apache/cxf/staxutils/StaxSource.java | 9 ++--
distribution/src/main/release/samples/pom.xml | 2 +-
.../tracing/brave/AbstractBraveClientProvider.java | 2 -
.../cxf/tracing/brave/AbstractBraveProvider.java | 2 -
.../src/it/jdk-cxf-with-toolchain/pom.xml | 36 +++++++++++++++-
.../codegen-plugin/src/it/mark-generated/pom.xml | 2 +-
.../src/it/wsdl-artifact-resolution/pom.xml | 2 +-
parent/pom.xml | 8 +++-
pom.xml | 6 +--
.../cxf/jaxrs/client/spec/ClientImplTest.java | 50 ++++++++++++++++++++++
.../microprofile/client/MPRestClientCallback.java | 2 +-
systests/microprofile/client/weld/pom.xml | 2 +-
.../oauth2/common/JPAOAuthDataProviderImpl.java | 10 -----
.../jaxrs/sse/tomcat/AbstractTomcatServer.java | 2 +-
.../wsdl_maven/codegen/src/it/it-parent/pom.xml | 2 +-
16 files changed, 125 insertions(+), 33 deletions(-)
[cxf] 09/12: Fix a bunch of compiler warnings
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b81199274d3e86a1ea5cfda443eefe9a8e60d0d5
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Wed Aug 29 13:04:21 2018 -0400
Fix a bunch of compiler warnings
(cherry picked from commit b576c1072b77f2aaa0eca3aa6be80a3367b674c0)
---
.../apache/cxf/tracing/brave/AbstractBraveClientProvider.java | 2 --
.../org/apache/cxf/tracing/brave/AbstractBraveProvider.java | 2 --
.../apache/cxf/microprofile/client/MPRestClientCallback.java | 2 +-
.../jaxrs/security/oauth2/common/JPAOAuthDataProviderImpl.java | 10 ----------
.../cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java | 2 +-
5 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
index 7bc4bcb..3fcb29e 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
@@ -54,7 +54,6 @@ public abstract class AbstractBraveClientProvider extends AbstractTracingProvide
final Request request = HttpAdapterFactory.request(requestHeaders, uri, method);
final HttpClientAdapter<Request, ?> adapter = HttpClientAdapterFactory.create(request);
- @SuppressWarnings("unchecked")
final HttpClientHandler<Request, ?> handler = HttpClientHandler.create(brave, adapter);
final Span span = handler.handleSend(
brave
@@ -102,7 +101,6 @@ public abstract class AbstractBraveClientProvider extends AbstractTracingProvide
final Response response = HttpAdapterFactory.response(responseStatus);
final HttpClientAdapter<?, Response> adapter = HttpClientAdapterFactory.create(response);
- @SuppressWarnings("unchecked")
final HttpClientHandler<?, Response> handler = HttpClientHandler.create(brave, adapter);
handler.handleReceive(response, null, scope.getSpan());
} finally {
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
index 043451b..d95db3e 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
@@ -53,7 +53,6 @@ public abstract class AbstractBraveProvider extends AbstractTracingProvider {
final Request request = HttpAdapterFactory.request(requestHeaders, uri, method);
final HttpServerAdapter<Request, ?> adapter = HttpServerAdapterFactory.create(request);
- @SuppressWarnings("unchecked")
final HttpServerHandler<Request, ?> handler = HttpServerHandler.create(brave, adapter);
Span span = handler.handleReceive(
@@ -106,7 +105,6 @@ public abstract class AbstractBraveProvider extends AbstractTracingProvider {
final Response response = HttpAdapterFactory.response(responseStatus);
final HttpServerAdapter<?, Response> adapter = HttpServerAdapterFactory.create(response);
- @SuppressWarnings("unchecked")
final HttpServerHandler<?, Response> handler = HttpServerHandler.create(brave, adapter);
handler.handleSend(response, null, scope.getSpan());
} finally {
diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MPRestClientCallback.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MPRestClientCallback.java
index a6863a3..a9c8857 100644
--- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MPRestClientCallback.java
+++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MPRestClientCallback.java
@@ -31,7 +31,7 @@ import javax.ws.rs.client.InvocationCallback;
import org.apache.cxf.jaxrs.client.JaxrsClientCallback;
-public class MPRestClientCallback<T> extends JaxrsClientCallback {
+public class MPRestClientCallback<T> extends JaxrsClientCallback<T> {
public MPRestClientCallback(InvocationCallback<T> handler,
Class<?> responseClass,
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JPAOAuthDataProviderImpl.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JPAOAuthDataProviderImpl.java
index d61cf4c..3899e77 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JPAOAuthDataProviderImpl.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JPAOAuthDataProviderImpl.java
@@ -18,8 +18,6 @@
*/
package org.apache.cxf.systest.jaxrs.security.oauth2.common;
-import java.io.InputStream;
-import java.security.cert.Certificate;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -34,8 +32,6 @@ import org.apache.cxf.rs.security.oauth2.grants.code.JPACodeDataProvider;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
import org.apache.cxf.rs.security.oauth2.saml.Constants;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
-import org.apache.cxf.rt.security.crypto.CryptoUtils;
-import org.apache.xml.security.utils.ClassLoaderUtils;
/**
* Extend the JPACodeDataProvider to allow refreshing of tokens
@@ -143,12 +139,6 @@ public class JPAOAuthDataProviderImpl extends JPACodeDataProvider {
}
- private Certificate loadCert() throws Exception {
- try (InputStream is = ClassLoaderUtils.getResourceAsStream("keys/Truststore.jks", this.getClass())) {
- return CryptoUtils.loadCertificate(is, "password".toCharArray(), "morpit", null);
- }
- }
-
@Override
public Client getClient(String clientId) {
Client c = super.getClient(clientId);
diff --git a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
index 799a134..8e31c50 100644
--- a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
+++ b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
@@ -62,7 +62,7 @@ public abstract class AbstractTomcatServer extends AbstractBusTestServerBase {
cxfServlet.addInitParameter("jaxrs.serviceClasses", BookStore.class.getName());
cxfServlet.addInitParameter("jaxrs.providers", JacksonJsonProvider.class.getName());
cxfServlet.setAsyncSupported(true);
- context.addServletMapping("/rest/*", "cxfServlet");
+ context.addServletMappingDecoded("/rest/*", "cxfServlet");
} else {
server.getHost().setAppBase(base.getAbsolutePath());
server.getHost().setAutoDeploy(true);
[cxf] 06/12: update some maven plugins
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a8b2d9beb6d5779c656c538fb281ba9ab75d7839
Author: Dennis Kieselhorst <ma...@dekies.de>
AuthorDate: Wed Aug 15 15:36:27 2018 +0200
update some maven plugins
(cherry picked from commit 3026115d07d9b71d4d3061171f946405d5a57e2a)
---
distribution/src/main/release/samples/pom.xml | 2 +-
maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml | 2 +-
.../codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml | 2 +-
pom.xml | 6 +++---
systests/microprofile/client/weld/pom.xml | 2 +-
systests/wsdl_maven/codegen/src/it/it-parent/pom.xml | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 650a62b..1822eca 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -171,7 +171,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
diff --git a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
index e0ca4b3..fe91f4f 100644
--- a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
@@ -36,7 +36,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
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 e8604d1..ba63e59 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
@@ -36,7 +36,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
diff --git a/pom.xml b/pom.xml
index 5278946..97f1cea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -214,7 +214,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.0</version>
<configuration>
<source>${cxf.jdk.version}</source>
<target>${cxf.jdk.version}</target>
@@ -434,7 +434,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -483,7 +483,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.0</version>
<configuration>
<source>${cxf.jdk.version}</source>
<target>${cxf.jdk.version}</target>
diff --git a/systests/microprofile/client/weld/pom.xml b/systests/microprofile/client/weld/pom.xml
index 5a2a08e..614bd23 100644
--- a/systests/microprofile/client/weld/pom.xml
+++ b/systests/microprofile/client/weld/pom.xml
@@ -93,7 +93,7 @@
<plugin>
<groupId>uk.co.deliverymind</groupId>
<artifactId>wiremock-maven-plugin</artifactId>
- <version>2.7.0</version>
+ <version>2.11.0</version>
<executions>
<execution>
<phase>generate-test-sources</phase>
diff --git a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
index 2d37301..dd2177d 100644
--- a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
+++ b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
[cxf] 04/12: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9dfb06c6c66604abe999d2d6c430a9ef7434af7a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Oct 5 17:23:24 2018 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 8b73b31..7e5c59a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -5,6 +5,9 @@ B 07251d65ed30455dd982fdbe694aab419d2fbfcb
B 143145643b3bb2f0a7ba97ec216bc59de754fd94
B 25e88017b49bde5a53bce8dab3ecc93aab6dd040
B 26568235d6db6ef44a74dac1ea1746319913c354
+B 26c2ede8ae46a6603cd62ea176a8ffc97d636e00
+B 2c53a23f13a313d8a5447d5628cd3fcc937e57c2
+B 35fd40f5b5e043f0044dce9286a9ce922bc30d2c
B 37e9a9b3ed51cb9042fd288ab5f9b847e96bff1d
B 384a11f419c06c52ec07d9f7114bb2134c18ba3c
B 4104641a4b731c72d66b1dace3d9ed4290226694
@@ -12,6 +15,7 @@ B 468cf8f3cfe9ef8285cd2ae66caddf666b7aaf13
B 4b7ede2d6cda7651b686653e0645c40b6684b81f
B 4da42032f95e667a402b113d6daf4bd0514c6d60
B 58e72337226f4e963abfc6f1a65625d86b7003b5
+B 7c7186c506e662ed0512dc47cdf58caa2ff2eafb
B 9db243c1aa44732996514200b490eb63683540b4
B a3295e61bcf8c00c13a79707841a58131fd9c97d
B a9c0c7705f70054a70eb3e95439d2a37731e0332
@@ -26,9 +30,12 @@ B d3de21c45a8f6c74996b5edecfe2e03f8b6a2bd3
B d873c8b623ed10464c1f1bae44a31fc725307676
B da5b01b32a59867b48e2b35a9281b3625f58d514
B e000e8c0b8ed82533cbeb4e3a39dd9fbf128383c
+B e63ce74570117d17552c5cfe9823bc93237583f2
B e9261069513b1947e16bf485182c328c07160e1c
B f652464526edb0cb7eac277ff64c9f2d02e2b920
B fc656dc1311963f5fc833856984b36b7ccd26042
+B fe5603d060881cf801db69ade3f9790423d48094
+B ffff30fdd8fc1b5987158d7d9fec8349b9d735d2
M 05b8db050b158d82aad57081a0dbb5e7c92cc3b1
M 0b920d7275800e651b2c48c982b1977249516ddf
M 1449f125586deaf6f5d87e282f0e1502eef4b6b4
[cxf] 10/12: Fix checkstyle with latest eclipse plugin
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b613bd1b8066f1362cce0e5e21efabb882531be4
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Fri Sep 14 12:49:57 2018 -0400
Fix checkstyle with latest eclipse plugin
(cherry picked from commit b5129ac6ebe3d24d6aac20b6f3ec273f39161c8a)
---
core/src/main/java/org/apache/cxf/staxutils/StaxSource.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java b/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java
index 9b8dce2..5dea29b 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java
@@ -66,8 +66,7 @@ public class StaxSource extends SAXSource implements XMLReader {
// Attributes are handled in START_ELEMENT
case XMLStreamConstants.ATTRIBUTE:
break;
- case XMLStreamConstants.CDATA:
- {
+ case XMLStreamConstants.CDATA: {
if (lexicalHandler != null) {
lexicalHandler.startCDATA();
}
@@ -80,16 +79,14 @@ public class StaxSource extends SAXSource implements XMLReader {
}
break;
}
- case XMLStreamConstants.CHARACTERS:
- {
+ case XMLStreamConstants.CHARACTERS: {
int length = streamReader.getTextLength();
int start = streamReader.getTextStart();
char[] chars = streamReader.getTextCharacters();
contentHandler.characters(chars, start, length);
break;
}
- case XMLStreamConstants.SPACE:
- {
+ case XMLStreamConstants.SPACE: {
int length = streamReader.getTextLength();
int start = streamReader.getTextStart();
char[] chars = streamReader.getTextCharacters();
[cxf] 05/12: CXF-7784: Adding test case for concurrent invocations
of the Invocation.Builder instance
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2ca662c9fb75c7201ddef576c3a118561b3b976d
Author: reta <dr...@gmail.com>
AuthorDate: Sun Jul 22 18:55:03 2018 -0400
CXF-7784: Adding test case for concurrent invocations of the Invocation.Builder instance
(cherry picked from commit 7d611371e968258830cd7cec4cdbb03bff79fc12)
---
.../cxf/jaxrs/client/spec/ClientImplTest.java | 50 ++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
index 88cf9da..1f502e4 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
@@ -20,12 +20,22 @@ package org.apache.cxf.jaxrs.client.spec;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.List;
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import java.util.logging.Handler;
import java.util.logging.LogRecord;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Invocation;
import javax.ws.rs.client.WebTarget;
import org.apache.cxf.common.logging.LogUtils;
@@ -187,4 +197,44 @@ public class ClientImplTest extends Assert {
}
fail("did not log expected message");
}
+
+ /**
+ * This test cases creates a single WebTarget instance and than calls
+ * the request() method concurrently from different threads verifying that
+ * its behavior is thread-safe.
+ */
+ @Test
+ public void testAccessInvocationBuilderConcurrently() {
+ String address = "http://localhost:8080/bookstore/{a}/simple";
+ Client client = ClientBuilder.newClient();
+
+ final Invocation.Builder builder = client
+ .target(address)
+ .resolveTemplate("a", "bookheaders")
+ .request("application/xml")
+ .header("a", "b");
+
+ final ExecutorService executor = Executors.newFixedThreadPool(20);
+ final CyclicBarrier barrier = new CyclicBarrier(20);
+
+ final Collection<CompletableFuture<?>> futures = new ArrayList<>();
+ for (int i = 0; i < 20; ++i) {
+ futures.add(CompletableFuture.supplyAsync(() -> {
+ try {
+ barrier.await(1, TimeUnit.SECONDS);
+ return builder.buildGet();
+ } catch (final InterruptedException ex) {
+ Thread.interrupted();
+ throw new CompletionException(ex);
+ } catch (BrokenBarrierException | TimeoutException ex) {
+ throw new CompletionException(ex);
+ }
+ }, executor));
+ }
+
+ CompletableFuture
+ .allOf(futures.toArray(new CompletableFuture<?>[0]))
+ .join();
+ }
+
}
[cxf] 12/12: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0b3a4feb20d4c7ba34f93d7bf6a74b09c581ad88
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Oct 5 17:29:46 2018 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 17aab9b..318cb8b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -4,6 +4,8 @@ B 057f4dc521f02227d7b36bbb508835a9edb69e15
B 07251d65ed30455dd982fdbe694aab419d2fbfcb
B 0ce4b232981790ca52bd7b636b4d1ceb5fc31d8a
B 143145643b3bb2f0a7ba97ec216bc59de754fd94
+B 16077ac65e46710865a883d1c60d87bcd422bb33
+B 1f431e2f8063793e84af56bc645484a9f0da58e7
B 25e88017b49bde5a53bce8dab3ecc93aab6dd040
B 26568235d6db6ef44a74dac1ea1746319913c354
B 26c2ede8ae46a6603cd62ea176a8ffc97d636e00
@@ -24,14 +26,17 @@ B 91a3122620ecf8ff767f2d769726b6039dbda6d4
B 9db243c1aa44732996514200b490eb63683540b4
B a3295e61bcf8c00c13a79707841a58131fd9c97d
B a41084608cd6677ca665e80f269221105d60deae
+B a70c45597c03a0d2365f9273a60fda5182c22457
B a9c0c7705f70054a70eb3e95439d2a37731e0332
B acc697f1c88f392bd952e07d50a9ae2ce0b76411
B ae994168f50894010f1f148ec3b6f35b17e4b63b
B b0094cc8813e56e2ec3694193df07d2d5de0ef66
+B b3268466338750b742ee900bbec13e568527be2c
B b8236c923ba409087e8db6132963924151918efc
B b8fc2da105029c10cf24ed344198fbefdd190648
B bb098089d18825ddc850fa82f4acee45e2b6ee7a
B bbe640de94faba94819074234cf4b6a8b637df75
+B c9c209c4506c88c13af1f01861eb80c8e9fcb27e
B cd6351b8b7eb9918f0221306bd6fac23ab1fcc88
B ce6419a07249005c4503bda59289054e6fc42576
B d3de21c45a8f6c74996b5edecfe2e03f8b6a2bd3
[cxf] 07/12: Attempt to fix Maven build failure: An API
incompatibility was encountered while executing
org.apache.maven.plugins:maven-pmd-plugin:3.10.0:pmd
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a92f6b0cf486235d40e932eef281591efd775fd2
Author: reta <dr...@gmail.com>
AuthorDate: Wed Aug 15 21:43:54 2018 -0400
Attempt to fix Maven build failure: An API incompatibility was encountered while executing org.apache.maven.plugins:maven-pmd-plugin:3.10.0:pmd
(cherry picked from commit 6b8b33acde5eb94ca84121591c68eb3e5e7b294f)
---
parent/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/parent/pom.xml b/parent/pom.xml
index b48309c..276fbbe 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -404,6 +404,12 @@
<groupId>org.apache.cxf.build-utils</groupId>
<artifactId>cxf-buildtools</artifactId>
<version>${cxf.build-utils.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
[cxf] 08/12: update commons-lang3
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1ff976589e9f336f7da071106c6a9dd68328193e
Author: Dennis Kieselhorst <ma...@dekies.de>
AuthorDate: Wed Aug 22 12:00:28 2018 +0200
update commons-lang3
(cherry picked from commit a55a3f2e1fc5a2e9c92ce791e18c9da0e486c0f7)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 276fbbe..a5ace90 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -81,7 +81,7 @@
<cxf.classmate.version>1.1.0</cxf.classmate.version>
<cxf.commons-codec.version>1.11</cxf.commons-codec.version>
<cxf.commons-collections.version>3.2.2</cxf.commons-collections.version>
- <cxf.commons-lang3.version>3.7</cxf.commons-lang3.version>
+ <cxf.commons-lang3.version>3.8</cxf.commons-lang3.version>
<cxf.commons-text.version>1.2</cxf.commons-text.version>
<cxf.derby.version>10.13.1.1</cxf.derby.version>
<cxf.dropwizard.version>3.2.6</cxf.dropwizard.version>
[cxf] 02/12: Attempt to fix toolchain JDK version for Jenkins builds
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 712d14588ddd3ad2e72becc82ef01e7d8e5df0ca
Author: reta <dr...@gmail.com>
AuthorDate: Fri Sep 21 12:47:57 2018 -0400
Attempt to fix toolchain JDK version for Jenkins builds
(cherry picked from commit 75a75655bce8652f1fc1d7e49298365aa4d86376)
---
maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 0a946a3..ef94cfd 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 @@
<configuration>
<toolchains>
<jdk>
- <version>${java.version}</version>
+ <version>${java.vm.specification.version}</version>
</jdk>
</toolchains>
</configuration>
[cxf] 03/12: Attempt to fix toolchain JDK version for Jenkins
builds (JDK10 is OK, JDK9 still failing)
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit af955fc7272df584ed80cc1bab9be7bf4bb46ab0
Author: reta <dr...@gmail.com>
AuthorDate: Fri Sep 21 14:54:20 2018 -0400
Attempt to fix toolchain JDK version for Jenkins builds (JDK10 is OK, JDK9 still failing)
(cherry picked from commit 8f57b02777451a2554b1fa720ab507d32da9f2b8)
---
.../src/it/jdk-cxf-with-toolchain/pom.xml | 34 +++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
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 ef94cfd..d60ef58 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
@@ -77,9 +77,41 @@
</build>
<profiles>
<profile><!-- used to avoid integration test failures for devs that have no toolchain config -->
+ <id>toolchain-java9</id>
+ <activation>
+ <jdk>9</jdk>
+ <property><!-- Jenkins -->
+ <name>env.BUILD_NUMBER</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <toolchains>
+ <jdk>
+ <version>1.9</version>
+ </jdk>
+ </toolchains>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>toolchain</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile><!-- used to avoid integration test failures for devs that have no toolchain config -->
<id>toolchain</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[10,)</jdk>
<property><!-- Jenkins -->
<name>env.BUILD_NUMBER</name>
</property>
[cxf] 11/12: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d6e75a4f9ae1531703f121892e19d234c42de510
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Oct 5 17:27:56 2018 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7e5c59a..17aab9b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2,6 +2,7 @@ origin/master
B 01559f20020110407ceb142e4ec53eaddcaeb9d4
B 057f4dc521f02227d7b36bbb508835a9edb69e15
B 07251d65ed30455dd982fdbe694aab419d2fbfcb
+B 0ce4b232981790ca52bd7b636b4d1ceb5fc31d8a
B 143145643b3bb2f0a7ba97ec216bc59de754fd94
B 25e88017b49bde5a53bce8dab3ecc93aab6dd040
B 26568235d6db6ef44a74dac1ea1746319913c354
@@ -10,14 +11,19 @@ B 2c53a23f13a313d8a5447d5628cd3fcc937e57c2
B 35fd40f5b5e043f0044dce9286a9ce922bc30d2c
B 37e9a9b3ed51cb9042fd288ab5f9b847e96bff1d
B 384a11f419c06c52ec07d9f7114bb2134c18ba3c
+B 3d7ae5999c55ac9db8f157b1c87efcf0e5b75dfa
B 4104641a4b731c72d66b1dace3d9ed4290226694
+B 446d27383b01febfefd450206d52944a028e2c3e
B 468cf8f3cfe9ef8285cd2ae66caddf666b7aaf13
B 4b7ede2d6cda7651b686653e0645c40b6684b81f
B 4da42032f95e667a402b113d6daf4bd0514c6d60
B 58e72337226f4e963abfc6f1a65625d86b7003b5
+B 68af13530379662fc99a716d635d4aab7c5fb027
B 7c7186c506e662ed0512dc47cdf58caa2ff2eafb
+B 91a3122620ecf8ff767f2d769726b6039dbda6d4
B 9db243c1aa44732996514200b490eb63683540b4
B a3295e61bcf8c00c13a79707841a58131fd9c97d
+B a41084608cd6677ca665e80f269221105d60deae
B a9c0c7705f70054a70eb3e95439d2a37731e0332
B acc697f1c88f392bd952e07d50a9ae2ce0b76411
B ae994168f50894010f1f148ec3b6f35b17e4b63b
@@ -26,6 +32,8 @@ B b8236c923ba409087e8db6132963924151918efc
B b8fc2da105029c10cf24ed344198fbefdd190648
B bb098089d18825ddc850fa82f4acee45e2b6ee7a
B bbe640de94faba94819074234cf4b6a8b637df75
+B cd6351b8b7eb9918f0221306bd6fac23ab1fcc88
+B ce6419a07249005c4503bda59289054e6fc42576
B d3de21c45a8f6c74996b5edecfe2e03f8b6a2bd3
B d873c8b623ed10464c1f1bae44a31fc725307676
B da5b01b32a59867b48e2b35a9281b3625f58d514
@@ -43,6 +51,7 @@ M 3904a477e70fe6385777120bfe4820ff9a7713f3
M 3aaaad57c6bf541825c6ccfe427de2bae2c246d9
M 4f8ae843f56e3ef84af43ae90f507e196726f0bf
M 504a1b7827bc76f3c5106b901b44e54513db17aa
+M 6b8b33acde5eb94ca84121591c68eb3e5e7b294f
M 86d7c657499b73bdbbd6ba9f1579e76ca0715357
M 886a055d49d844e445721e4752c7a6360cbe8b9a
M 9c02f616f6aec1cf43f1d6bac810d606dab98a72
[cxf] 01/12: Attempt to fix toolchain JDK version for Jenkins builds
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3dbfe401d8e4faac35c65607bb0848bfdbfacfa3
Author: reta <dr...@gmail.com>
AuthorDate: Fri Sep 21 12:14:53 2018 -0400
Attempt to fix toolchain JDK version for Jenkins builds
(cherry picked from commit 5c3f8e1ab4417dcfade144f54f126b5ab7be76e0)
---
maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 2b6bf20..0a946a3 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 @@
<configuration>
<toolchains>
<jdk>
- <version>1.8</version>
+ <version>${java.version}</version>
</jdk>
</toolchains>
</configuration>