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
The following commit(s) were added to refs/heads/master by this push:
new 55abc6f Updating some dependencies
55abc6f is described below
commit 55abc6f8416fd81f26627fa42a37f903f9ef7965
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Thu Dec 12 15:13:05 2019 +0000
Updating some dependencies
---
parent/pom.xml | 19 ++++++++--------
pom.xml | 4 ++--
.../jaxrs/tracing/brave/BraveTracingTest.java | 12 +++++-----
.../opentracing/OpenTracingTracingTest.java | 26 +++++++++++-----------
.../opentracing/OpenTracingTracingTest.java | 4 ++--
5 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 6bcc80b..434994c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -56,7 +56,7 @@
<cxf.asm.artifactId>asm</cxf.asm.artifactId>
<cxf.asm.version>7.1</cxf.asm.version>
<cxf.osgi.asm.version>[3.0,8)</cxf.osgi.asm.version>
- <cxf.easymock.version>4.0.2</cxf.easymock.version>
+ <cxf.easymock.version>4.1</cxf.easymock.version>
<!-- OSGi related properties -->
<cxf.fragment.host />
<cxf.bundle.activator />
@@ -83,7 +83,7 @@
<cxf.apacheds.version>2.0.0.AM25</cxf.apacheds.version>
<cxf.arquillian.version>1.1.14.Final</cxf.arquillian.version>
<cxf.arquillian.weld.container.version>2.0.1.Final</cxf.arquillian.weld.container.version>
- <cxf.artemis.version>2.9.0</cxf.artemis.version>
+ <cxf.artemis.version>2.10.1</cxf.artemis.version>
<cxf.aspectj.version>1.9.1</cxf.aspectj.version>
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>2.5.2</cxf.atmosphere.version>
@@ -132,6 +132,7 @@
<cxf.httpcomponents.core.version>4.4.12</cxf.httpcomponents.core.version>
<cxf.jackson.version>2.10.1</cxf.jackson.version>
<cxf.jackson.databind.version>2.10.1</cxf.jackson.databind.version>
+ <cxf.jacorb.version>3.9</cxf.jacorb.version>
<cxf.jaeger.version>1.0.0</cxf.jaeger.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.javassist.version>3.25.0-GA</cxf.javassist.version>
@@ -189,7 +190,7 @@
<cxf.servlet-api.group>javax.servlet</cxf.servlet-api.group>
<cxf.servlet-api.version>3.1.0</cxf.servlet-api.version>
<cxf.slf4j.version>1.7.29</cxf.slf4j.version>
- <cxf.snakeyaml.version>1.24</cxf.snakeyaml.version>
+ <cxf.snakeyaml.version>1.25</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
<cxf.spring.boot.version>2.1.11.RELEASE</cxf.spring.boot.version>
<cxf.spring.ldap.version>2.3.2.RELEASE</cxf.spring.ldap.version>
@@ -206,7 +207,7 @@
<cxf.tomcat.version>8.5.47</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.3</cxf.tomitribe.http.signature.version>
<cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version>
- <cxf.undertow.version>2.0.23.Final</cxf.undertow.version>
+ <cxf.undertow.version>2.0.28.Final</cxf.undertow.version>
<!-- the Export-Package is the same as the Maven artifact
version (with the Final), but we don't want an import package
with a version
with a qualifier. We do want a range. -->
@@ -219,7 +220,7 @@
<cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
<cxf.wss4j.version>2.3.0-SNAPSHOT</cxf.wss4j.version>
<cxf.xalan.version>2.7.2</cxf.xalan.version>
- <cxf.xbean.version>4.14</cxf.xbean.version>
+ <cxf.xbean.version>4.15</cxf.xbean.version>
<cxf.xerces.version>2.12.0</cxf.xerces.version>
<cxf.xmlschema.version>2.2.4</cxf.xmlschema.version>
<cxf.zest.version>2.1</cxf.zest.version>
@@ -1386,7 +1387,7 @@
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>3.1.6</version>
+ <version>4.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -2855,7 +2856,7 @@
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
- <version>2.3.0</version>
+ <version>2.3.1</version>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
@@ -2887,14 +2888,14 @@
<dependency>
<groupId>org.jacorb</groupId>
<artifactId>jacorb</artifactId>
- <version>3.7</version>
+ <version>${cxf.jacorb.version}</version>
<scope>test</scope>
</dependency>
<!-- This artifact needs to be included in compile scope since
the corba module has been removed from jdk 11 -->
<dependency>
<groupId>org.jacorb</groupId>
<artifactId>jacorb-omgapi</artifactId>
- <version>3.7</version>
+ <version>${cxf.jacorb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/pom.xml b/pom.xml
index 047b129..92e3cf5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -468,7 +468,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1</version>
<configuration>
<attach>true</attach>
<source>${cxf.jdk.version}</source>
@@ -538,7 +538,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.6</version>
+ <version>1.10.7</version>
</dependency>
</dependencies>
</plugin>
diff --git
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
index 08e99ae..6308260 100644
---
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
+++
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.systest.jaxrs.tracing.brave;
import java.net.MalformedURLException;
+import java.time.Duration;
import java.util.Arrays;
import java.util.Collections;
import java.util.concurrent.ExecutionException;
@@ -53,7 +54,6 @@ import org.apache.cxf.tracing.brave.TraceScope;
import org.apache.cxf.tracing.brave.jaxrs.BraveClientProvider;
import org.apache.cxf.tracing.brave.jaxrs.BraveFeature;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-import org.awaitility.Duration;
import org.junit.After;
import org.junit.BeforeClass;
@@ -83,7 +83,7 @@ public class BraveTracingTest extends
AbstractClientServerTestBase {
private static final AtomicLong RANDOM = new AtomicLong();
- @Rule
+ @Rule
public ExpectedException expectedException = ExpectedException.none();
private final Tracing brave = Tracing.newBuilder()
@@ -333,7 +333,7 @@ public class BraveTracingTest extends
AbstractClientServerTestBase {
}
// Await till flush happens, usually a second is enough
- await().atMost(Duration.ONE_SECOND).until(()->
TestSpanReporter.getAllSpans().size() == 4);
+ await().atMost(Duration.ofSeconds(1L)).until(()->
TestSpanReporter.getAllSpans().size() == 4);
assertThat(TestSpanReporter.getAllSpans().size(), equalTo(4));
assertThat(TestSpanReporter.getAllSpans().get(3).name(), equalTo("test
span"));
@@ -362,7 +362,7 @@ public class BraveTracingTest extends
AbstractClientServerTestBase {
}
// Await till flush happens, usually a second is enough
- await().atMost(Duration.ONE_SECOND).until(()->
TestSpanReporter.getAllSpans().size() == 4);
+ await().atMost(Duration.ofSeconds(1L)).until(()->
TestSpanReporter.getAllSpans().size() == 4);
assertThat(TestSpanReporter.getAllSpans().size(), equalTo(4));
assertThat(TestSpanReporter.getAllSpans().get(3).name(), equalTo("test
span"));
@@ -403,7 +403,7 @@ public class BraveTracingTest extends
AbstractClientServerTestBase {
.create("http://localhost:"; + PORT + "/bookstore/books/long",
Collections.emptyList(),
Arrays.asList(new BraveClientFeature(brave)), null)
.accept(MediaType.APPLICATION_JSON);
-
+
HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
httpClientPolicy.setConnectionTimeout(100);
httpClientPolicy.setReceiveTimeout(100);
@@ -413,7 +413,7 @@ public class BraveTracingTest extends
AbstractClientServerTestBase {
try {
client.get();
} finally {
- await().atMost(Duration.ONE_SECOND).until(()->
TestSpanReporter.getAllSpans().size() == 2);
+ await().atMost(Duration.ofSeconds(1L)).until(()->
TestSpanReporter.getAllSpans().size() == 2);
assertThat(TestSpanReporter.getAllSpans().size(), equalTo(2));
assertThat(TestSpanReporter.getAllSpans().get(0).name(),
equalTo("get " + client.getCurrentURI()));
assertThat(TestSpanReporter.getAllSpans().get(0).tags(),
hasKey("error"));
diff --git
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
index 058b05c..e14451a 100644
---
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
+++
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.systest.jaxrs.tracing.opentracing;
import java.net.MalformedURLException;
+import java.time.Duration;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
@@ -48,7 +49,6 @@ import
org.apache.cxf.tracing.opentracing.OpenTracingClientFeature;
import org.apache.cxf.tracing.opentracing.jaxrs.OpenTracingClientProvider;
import org.apache.cxf.tracing.opentracing.jaxrs.OpenTracingFeature;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-import org.awaitility.Duration;
import io.jaegertracing.internal.JaegerSpanContext;
import io.jaegertracing.internal.JaegerTracer;
@@ -85,14 +85,14 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
private static final InMemoryReporter REPORTER = new InMemoryReporter();
- @Rule
+ @Rule
public ExpectedException expectedException = ExpectedException.none();
private final Tracer tracer = new JaegerTracer.Builder("tracer-jaxrs")
.withSampler(new ConstSampler(true))
.withReporter(REPORTER)
.build();
-
+
public static class BraveServer extends AbstractTestServerBase {
private org.apache.cxf.endpoint.Server server;
@@ -118,7 +118,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
server.destroy();
}
}
-
+
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
@@ -194,7 +194,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
final Response r =
withTrace(createWebClient("/bookstore/books/async"), spanId).get();
assertEquals(Status.OK.getStatusCode(), r.getStatus());
- await().atMost(Duration.ONE_SECOND).until(()->
REPORTER.getSpans().size() == 2);
+ await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 2);
assertThat(REPORTER.getSpans().size(), equalTo(2));
assertEquals("Processing books",
REPORTER.getSpans().get(0).getOperationName());
@@ -220,7 +220,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
final Response r = createWebClient("/bookstore/books/async").get();
assertEquals(Status.OK.getStatusCode(), r.getStatus());
- await().atMost(Duration.ONE_SECOND).until(()->
REPORTER.getSpans().size() == 2);
+ await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 2);
assertThat(REPORTER.getSpans().size(), equalTo(2));
assertThat(REPORTER.getSpans().get(0).getOperationName(),
equalTo("Processing books"));
@@ -234,7 +234,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
final Response r = client.async().get().get(1L, TimeUnit.SECONDS);
assertEquals(Status.OK.getStatusCode(), r.getStatus());
- await().atMost(Duration.ONE_SECOND).until(()->
REPORTER.getSpans().size() == 3);
+ await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 3);
assertThat(REPORTER.getSpans().size(), equalTo(3));
assertThat(REPORTER.getSpans().get(0).getOperationName(), equalTo("Get
Books"));
@@ -316,7 +316,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
}
// Await till flush happens, usually every second
- await().atMost(Duration.ONE_SECOND).until(()->
REPORTER.getSpans().size() == 4);
+ await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 4);
assertThat(REPORTER.getSpans().size(), equalTo(4));
assertThat(REPORTER.getSpans().get(3).getOperationName(),
equalTo("test span"));
@@ -333,7 +333,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
assertEquals(Status.OK.getStatusCode(), r.getStatus());
assertThat(tracer.activeSpan().context(), equalTo(span.context()));
- await().atMost(Duration.ONE_SECOND).until(()->
REPORTER.getSpans().size() == 3);
+ await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 3);
assertThat(REPORTER.getSpans().size(), equalTo(3));
assertThat(REPORTER.getSpans().get(0).getOperationName(),
equalTo("Get Books"));
@@ -347,7 +347,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
}
// Await till flush happens, usually every second
- await().atMost(Duration.ONE_SECOND).until(()->
REPORTER.getSpans().size() == 4);
+ await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 4);
assertThat(REPORTER.getSpans().size(), equalTo(4));
assertThat(REPORTER.getSpans().get(3).getOperationName(),
equalTo("test span"));
@@ -372,7 +372,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
.create("http://localhost:"; + PORT + "/bookstore/books/long",
Collections.emptyList(),
Arrays.asList(new OpenTracingClientFeature(tracer)), null)
.accept(MediaType.APPLICATION_JSON);
-
+
HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
httpClientPolicy.setConnectionTimeout(100);
httpClientPolicy.setReceiveTimeout(100);
@@ -382,14 +382,14 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
try {
client.get();
} finally {
- await().atMost(Duration.ONE_SECOND).until(()->
REPORTER.getSpans().size() == 2);
+ await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 2);
assertThat(REPORTER.getSpans().toString(),
REPORTER.getSpans().size(), equalTo(2));
assertThat(REPORTER.getSpans().get(0).getOperationName(),
equalTo("GET " + client.getCurrentURI()));
assertThat(REPORTER.getSpans().get(0).getTags(),
hasItem(Tags.ERROR.getKey(), Boolean.TRUE));
assertThat(REPORTER.getSpans().get(1).getOperationName(),
equalTo("GET /bookstore/books/long"));
}
}
-
+
private static WebClient createWebClient(final String path, final Object
... providers) {
return WebClient
.create("http://localhost:"; + PORT + path,
Arrays.asList(providers))
diff --git
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
index 52130d8..d96a9ce 100644
---
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
+++
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.systest.jaxws.tracing.opentracing;
+import java.time.Duration;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -40,7 +41,6 @@ import org.apache.cxf.testutil.common.AbstractTestServerBase;
import org.apache.cxf.tracing.opentracing.OpenTracingClientFeature;
import org.apache.cxf.tracing.opentracing.OpenTracingFeature;
import org.apache.cxf.tracing.opentracing.internal.TextMapInjectAdapter;
-import org.awaitility.Duration;
import io.jaegertracing.internal.JaegerSpanContext;
import io.jaegertracing.internal.JaegerTracer;
@@ -175,7 +175,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
}
// Await till flush happens, usually every second
- await().atMost(Duration.ONE_SECOND).until(()->
REPORTER.getSpans().size() == 4);
+ await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 4);
assertThat(REPORTER.getSpans().size(), equalTo(4));
assertThat(REPORTER.getSpans().get(3).getOperationName(),
equalTo("test span"));
