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 2019/12/12 16:29:35 UTC

[cxf] 01/02: Updating some dependencies

This is an automated email from the ASF dual-hosted git repository.

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

commit 28c4265fb0e9fcc2396b0e79c94772f57151c53d
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Dec 12 15:13:05 2019 +0000

    Updating some dependencies
    
    (cherry picked from commit 55abc6f8416fd81f26627fa42a37f903f9ef7965)
    
    # Conflicts:
    #	parent/pom.xml
    #	systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
    #	systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
    #	systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
---
 parent/pom.xml                                     | 19 +++----
 pom.xml                                            |  4 +-
 .../jaxrs/tracing/brave/BraveTracingTest.java      | 10 ++--
 .../opentracing/OpenTracingTracingTest.java        | 60 ++++++++++++++++++++--
 .../opentracing/OpenTracingTracingTest.java        |  4 +-
 5 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 45524b6..0498441 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>
@@ -130,6 +130,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>0.35.5</cxf.jaeger.version>
         <cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
         <cxf.javassist.version>3.25.0-GA</cxf.javassist.version>
@@ -187,7 +188,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>
@@ -204,7 +205,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. -->
@@ -217,7 +218,7 @@
         <cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
         <cxf.wss4j.version>2.2.4</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>
@@ -1384,7 +1385,7 @@
             <dependency>
                 <groupId>org.awaitility</groupId>
                 <artifactId>awaitility</artifactId>
-                <version>3.1.6</version>
+                <version>4.0.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -2838,7 +2839,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>
@@ -2870,14 +2871,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 5b52d7d..2b78798 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 7f053bd..97c3012 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.Collection;
 import java.util.Collections;
@@ -55,7 +56,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.Before;
 import org.junit.BeforeClass;
@@ -343,7 +343,7 @@ public class BraveTracingTest extends AbstractBusClientServerTestBase {
         }
 
         // 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"));
@@ -374,7 +374,7 @@ public class BraveTracingTest extends AbstractBusClientServerTestBase {
         }
 
         // 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"));
@@ -415,7 +415,7 @@ public class BraveTracingTest extends AbstractBusClientServerTestBase {
             .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);
@@ -425,7 +425,7 @@ public class BraveTracingTest extends AbstractBusClientServerTestBase {
         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 91c8d41..ca51cd5 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.Collection;
 import java.util.Collections;
@@ -52,7 +53,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.Configuration;
 import io.jaegertracing.Configuration.ReporterConfiguration;
@@ -121,7 +121,7 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
             sf.create();
         }
     }
-    
+
     @BeforeClass
     public static void startServers() throws Exception {
         AbstractResourceInfo.clearAllMaps();
@@ -220,12 +220,22 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
         final Response r = withTrace(createWebClient("/bookstore/books/async"), spanId).get();
         assertEquals(Status.OK.getStatusCode(), r.getStatus());
 
+<<<<<<< HEAD
         synchro.await(1, TimeUnit.MINUTES);
         assertThat(TestSender.getAllSpans().size(), equalTo(2));
         assertEquals("Processing books", TestSender.getAllSpans().get(0).getOperationName());
         assertEquals("GET /bookstore/books/async", TestSender.getAllSpans().get(1).getOperationName());
         assertThat(TestSender.getAllSpans().get(1).getReferences(), not(empty()));
         assertThat(TestSender.getAllSpans().get(1).getReferences().get(0).getSpanContext().getSpanId(),
+=======
+        await().atMost(Duration.ofSeconds(1L)).until(()-> REPORTER.getSpans().size() == 2);
+
+        assertThat(REPORTER.getSpans().size(), equalTo(2));
+        assertEquals("Processing books", REPORTER.getSpans().get(0).getOperationName());
+        assertEquals("GET /bookstore/books/async", REPORTER.getSpans().get(1).getOperationName());
+        assertThat(REPORTER.getSpans().get(1).getReferences(), not(empty()));
+        assertThat(REPORTER.getSpans().get(1).getReferences().get(0).getSpanContext().getSpanId(),
+>>>>>>> 55abc6f841... Updating some dependencies
             equalTo(spanId.getSpanId()));
     }
 
@@ -248,10 +258,18 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
         final Response r = createWebClient("/bookstore/books/async").get();
         assertEquals(Status.OK.getStatusCode(), r.getStatus());
 
+<<<<<<< HEAD
         synchro.await(1, TimeUnit.MINUTES);
         assertThat(TestSender.getAllSpans().size(), equalTo(2));
         assertThat(TestSender.getAllSpans().get(0).getOperationName(), equalTo("Processing books"));
         assertThat(TestSender.getAllSpans().get(1).getOperationName(), equalTo("GET /bookstore/books/async"));
+=======
+        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"));
+        assertThat(REPORTER.getSpans().get(1).getOperationName(), equalTo("GET /bookstore/books/async"));
+>>>>>>> 55abc6f841... Updating some dependencies
     }
 
     @Test
@@ -262,8 +280,12 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
         final WebClient client = createWebClient("/bookstore/books", openTracingClientProvider);
         final Future<Response> f = client.async().get();
 
+<<<<<<< HEAD
         final Response r = f.get(1, TimeUnit.SECONDS);
         assertEquals(Status.OK.getStatusCode(), r.getStatus());
+=======
+        await().atMost(Duration.ofSeconds(1L)).until(()-> REPORTER.getSpans().size() == 3);
+>>>>>>> 55abc6f841... Updating some dependencies
 
         synchro.await(1, TimeUnit.MINUTES);
         assertThat(TestSender.getAllSpans().size(), equalTo(3));
@@ -354,7 +376,11 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
         }
 
         // Await till flush happens, usually every second
+<<<<<<< HEAD
         await().atMost(Duration.ONE_SECOND).until(()-> TestSender.getAllSpans().size() == 4);
+=======
+        await().atMost(Duration.ofSeconds(1L)).until(()-> REPORTER.getSpans().size() == 4);
+>>>>>>> 55abc6f841... Updating some dependencies
 
         assertThat(TestSender.getAllSpans().size(), equalTo(4));
         assertThat(TestSender.getAllSpans().get(3).getOperationName(), equalTo("test span"));
@@ -376,6 +402,7 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
             assertEquals(Status.OK.getStatusCode(), r.getStatus());
             assertThat(tracer.activeSpan().context(), equalTo(span.context()));
 
+<<<<<<< HEAD
             synchro.await(1, TimeUnit.MINUTES);
             assertThat(TestSender.getAllSpans().size(), equalTo(3));
             assertThat(TestSender.getAllSpans().get(0).getOperationName(), equalTo("Get Books"));
@@ -384,12 +411,27 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
             assertThat(TestSender.getAllSpans().get(1).getReferences(), not(empty()));
             assertThat(TestSender.getAllSpans().get(2).getOperationName(), equalTo("GET " + client.getCurrentURI()));
             assertThat(TestSender.getAllSpans().get(2).getReferences(), not(empty()));
+=======
+            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"));
+            assertThat(REPORTER.getSpans().get(0).getReferences(), not(empty()));
+            assertThat(REPORTER.getSpans().get(1).getOperationName(), equalTo("GET /bookstore/books"));
+            assertThat(REPORTER.getSpans().get(1).getReferences(), not(empty()));
+            assertThat(REPORTER.getSpans().get(2).getOperationName(), equalTo("GET " + client.getCurrentURI()));
+            assertThat(REPORTER.getSpans().get(2).getReferences(), not(empty()));
+>>>>>>> 55abc6f841... Updating some dependencies
         } finally {
             span.finish();
         }
 
         // Await till flush happens, usually every second
+<<<<<<< HEAD
         await().atMost(Duration.ONE_SECOND).until(()-> TestSender.getAllSpans().size() == 4);
+=======
+        await().atMost(Duration.ofSeconds(1L)).until(()-> REPORTER.getSpans().size() == 4);
+>>>>>>> 55abc6f841... Updating some dependencies
 
         assertThat(TestSender.getAllSpans().size(), equalTo(4));
         assertThat(TestSender.getAllSpans().get(3).getOperationName(), equalTo("test span"));
@@ -414,7 +456,7 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
             .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);
@@ -424,6 +466,7 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
         try {
             client.get();
         } finally {
+<<<<<<< HEAD
             await().atMost(Duration.ONE_SECOND).until(()-> TestSender.getAllSpans().size() == 2);
             assertThat(TestSender.getAllSpans().toString(), TestSender.getAllSpans().size(), equalTo(2));
             assertThat(TestSender.getAllSpans().get(0).getOperationName(), equalTo("GET " + client.getCurrentURI()));
@@ -433,6 +476,17 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
     }
     
     protected WebClient createWebClient(final String url, final Object ... providers) {
+=======
+            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) {
+>>>>>>> 55abc6f841... Updating some dependencies
         return WebClient
             .create("http://localhost:" + PORT + url, Arrays.asList(providers))
             .accept(MediaType.APPLICATION_JSON);
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 ddf6ee6..80ecded 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
@@ -19,6 +19,7 @@
 package org.apache.cxf.systest.jaxws.tracing.opentracing;
 
 import java.net.MalformedURLException;
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,7 +41,6 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 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.Configuration;
 import io.jaegertracing.Configuration.ReporterConfiguration;
@@ -199,7 +199,7 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
         }
 
         // Await till flush happens, usually every second
-        await().atMost(Duration.ONE_SECOND).until(()-> TestSender.getAllSpans().size() == 4);
+        await().atMost(Duration.ofSeconds(1L)).until(()-> TestSender.getAllSpans().size() == 4);
 
         assertThat(TestSender.getAllSpans().size(), equalTo(4));
         assertThat(TestSender.getAllSpans().get(3).getOperationName(), equalTo("test span"));