Solving conflicts

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
eclipse-ee4j · Nov 16, 2022 · 21c2ed9 · 21c2ed9
2 parents 8557364 + f3b808e
commit 21c2ed9
Show file tree

Hide file tree

Showing 33 changed files with 263 additions and 245 deletions.
diff --git a/...tor/src/main/java/org/glassfish/jersey/jdk/connector/internal/TransferEncodingParser.java b/...tor/src/main/java/org/glassfish/jersey/jdk/connector/internal/TransferEncodingParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -218,7 +218,8 @@ private boolean parseHttpChunkLength(final ByteBuffer input) throws ParseExcepti
 
                         while (offset < limit) {
                             final byte b = input.get(offset);
-                            if (isSpaceOrTab(b) || /*trailing spaces are not allowed by the spec, but some server put it there*/
+                            if (isSpaceOrTab(b)
+                                    || /*trailing spaces are not allowed by the spec, but some server put it there*/
                                     b == HttpParserUtils.CR || b == HttpParserUtils.SEMI_COLON) {
                                 headerParsingState.checkpoint = offset;
                             } else if (b == HttpParserUtils.LF) {

diff --git a/...-client/src/test/java/org/glassfish/jersey/client/JerseyCompletionStageRxInvokerTest.java b/...-client/src/test/java/org/glassfish/jersey/client/JerseyCompletionStageRxInvokerTest.java
@@ -111,7 +111,7 @@ public void testNotFoundReadEntityViaClass() throws Throwable {
 
     @Test
     public void testNotFoundReadEntityViaGenericType() throws Throwable {
-        Assertions.assertThrows(NotFoundException.class, () ->{
+        Assertions.assertThrows(NotFoundException.class, () -> {
             try {
                 client.target("http://jersey.java.net")
                       .request()

diff --git a/docs/src/main/docbook/migration.xml b/docs/src/main/docbook/migration.xml
@@ -28,6 +28,19 @@
          xml:id="migration">
     <title>Migration Guide</title>
 
+    <section xml:id="mig-2.38">
+        <title>Migrating from Jersey 2.37 to 2.38</title>
+        <section xml:id="mig-2.38-breaking-changes">
+            <title>Breaking Changes</title>
+            <para>
+                Versions 2.38 introduces non-compatible change for dependency of Open Tracing. As soon as Open Tracing
+                breaks compatibility between the 0.30.0 and the 0.33.0 versions in its API, and Jersey updates Open Tracing
+                to the 0.33.0 version in the 2.38, for everyone who uses Open Tracing framework it is required to upgrade
+                their dependencies to the 0.33.0 version of the Open Tracing respectively.
+            </para>
+        </section>
+    </section>
+
     <section xml:id="mig-2.30">
         <title>Migrating from Jersey 2.29 to 2.29.1 and 2.30+</title>
         <section xml:id="mig-2.30-breaking-changes">

diff --git a/examples/extended-wadl-webapp/pom.xml b/examples/extended-wadl-webapp/pom.xml
@@ -238,7 +238,7 @@
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-junit47</artifactId>
-                        <version>${surefire.version}</version>
+                        <version>${surefire.mvn.plugin.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/examples/groovy/pom.xml b/examples/groovy/pom.xml
@@ -28,7 +28,7 @@
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <type>pom</type>
-            <version>4.0.4</version>
+            <version>${groovy.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.test-framework.providers</groupId>

diff --git a/examples/open-tracing/src/main/java/org/glassfish/jersey/examples/opentracing/App.java b/examples/open-tracing/src/main/java/org/glassfish/jersey/examples/opentracing/App.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -113,7 +113,7 @@ static class ReqFilterA implements ContainerRequestFilter {
         public void filter(ContainerRequestContext requestContext) throws IOException {
             Span span = OpenTracingUtils
                     .getRequestSpan(requestContext)
-                    .orElse(GlobalTracer.get().buildSpan("ad-hoc-span-reqA").startManual());
+                    .orElse(GlobalTracer.get().buildSpan("ad-hoc-span-reqA").start());
             span.log("ReqFilterA.filter() invoked");
         }
     }
@@ -128,7 +128,7 @@ static class ReqFilterB implements ContainerRequestFilter {
         public void filter(ContainerRequestContext requestContext) throws IOException {
             Span span = OpenTracingUtils
                     .getRequestSpan(requestContext)
-                    .orElse(GlobalTracer.get().buildSpan("ad-hoc-span-reqB").startManual());
+                    .orElse(GlobalTracer.get().buildSpan("ad-hoc-span-reqB").start());
             span.log("ReqFilterB.filter() invoked");
         }
     }
@@ -141,7 +141,7 @@ static class RespFilterA implements ContainerResponseFilter {
         public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException {
             Span span = OpenTracingUtils
                     .getRequestSpan(requestContext)
-                    .orElse(GlobalTracer.get().buildSpan("ad-hoc-span-respA").startManual());
+                    .orElse(GlobalTracer.get().buildSpan("ad-hoc-span-respA").start());
             span.log("RespFilterA.filter() invoked");
         }
     }
@@ -154,7 +154,7 @@ static class RespFilterB implements ContainerResponseFilter {
         public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException {
             Span span = OpenTracingUtils
                     .getRequestSpan(requestContext)
-                    .orElse(GlobalTracer.get().buildSpan("ad-hoc-span-respB").startManual());
+                    .orElse(GlobalTracer.get().buildSpan("ad-hoc-span-respB").start());
             span.log("RespFilterB.filter() invoked");
         }
     }

diff --git a/examples/osgi-helloworld-webapp/functional-test/pom.xml b/examples/osgi-helloworld-webapp/functional-test/pom.xml
@@ -80,15 +80,6 @@
             <artifactId>javassist</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <!-- logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.4</version>
-            <scope>test</scope>
-        </dependency>
-
         <!-- JUnit and Pax-Exam dependencies -->
         <dependency>
             <groupId>org.osgi</groupId>

diff --git a/examples/osgi-helloworld-webapp/war-bundle/pom.xml b/examples/osgi-helloworld-webapp/war-bundle/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.5</version><!-- the current project's ${servlet2.version} is 2.4 and that's not enough -->
+            <version>${servlet2.version}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/ext/microprofile/mp-rest-client/pom.xml b/ext/microprofile/mp-rest-client/pom.xml
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.eclipse.microprofile.rest.client</groupId>
             <artifactId>microprofile-rest-client-api</artifactId>
-            <version>2.0</version>
+            <version>${microprofile.rest.client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile.config</groupId>
             <artifactId>microprofile-config-api</artifactId>
-            <version>1.4</version>
+            <version>${microprofile.config.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.reactivestreams</groupId>
             <artifactId>reactive-streams</artifactId>
-            <version>1.0.3</version>
+            <version>${reactive.streams.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>

diff --git a/ext/rx/rx-client-rxjava2/pom.xml b/ext/rx/rx-client-rxjava2/pom.xml
@@ -42,11 +42,17 @@
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
             <version>${rxjava2.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.reactivestreams</groupId>
+                    <artifactId>reactive-streams</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.reactivestreams</groupId>
             <artifactId>reactive-streams</artifactId>
-            <version>1.0.0</version>
+            <version>${reactive.streams.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/...g/src/main/java/org/glassfish/jersey/opentracing/OpenTracingApplicationEventListener.java b/...g/src/main/java/org/glassfish/jersey/opentracing/OpenTracingApplicationEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -25,6 +25,7 @@
 import javax.ws.rs.container.ContainerRequestFilter;
 import javax.ws.rs.container.ContainerResponseFilter;
 
+import io.opentracing.propagation.TextMapAdapter;
 import org.glassfish.jersey.server.ContainerRequest;
 import org.glassfish.jersey.server.ContainerResponse;
 import org.glassfish.jersey.server.monitoring.ApplicationEvent;
@@ -36,7 +37,6 @@
 import io.opentracing.SpanContext;
 import io.opentracing.Tracer;
 import io.opentracing.propagation.Format;
-import io.opentracing.propagation.TextMapExtractAdapter;
 import io.opentracing.tag.Tags;
 import io.opentracing.util.GlobalTracer;
 
@@ -84,7 +84,7 @@ private Span handleRequestStart(ContainerRequest request) {
                         (entry) -> OpenTracingUtils.formatList(entry.getValue())));
 
         final SpanContext extractedContext =
-                globalTracer.extract(Format.Builtin.HTTP_HEADERS, new TextMapExtractAdapter(mappedHeaders));
+                globalTracer.extract(Format.Builtin.HTTP_HEADERS, new TextMapAdapter(mappedHeaders));
 
         Tracer.SpanBuilder spanBuilder = globalTracer
                 .buildSpan(OpenTracingFeature.DEFAULT_REQUEST_SPAN_NAME)
@@ -99,7 +99,7 @@ private Span handleRequestStart(ContainerRequest request) {
             spanBuilder = spanBuilder.asChildOf(extractedContext);
         }
 
-        final Span span = spanBuilder.startManual();
+        final Span span = spanBuilder.start();
         request.setProperty(OpenTracingFeature.SPAN_CONTEXT_PROPERTY, span);
         span.log(LocalizationMessages.OPENTRACING_LOG_REQUEST_STARTED());
         return span;
@@ -157,7 +157,7 @@ public void onEvent(RequestEvent event) {
 
                     resourceSpan = globalTracer.buildSpan(OpenTracingFeature.DEFAULT_RESOURCE_SPAN_NAME)
                                                .asChildOf(requestSpan)
-                                               .startManual();
+                                               .start();
 
                     event.getContainerRequest().setProperty(OpenTracingFeature.SPAN_CONTEXT_PROPERTY, resourceSpan);
                     break;

diff --git a/...racing/src/main/java/org/glassfish/jersey/opentracing/OpenTracingClientRequestFilter.java b/...racing/src/main/java/org/glassfish/jersey/opentracing/OpenTracingClientRequestFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -29,7 +29,7 @@
 import io.opentracing.SpanContext;
 import io.opentracing.Tracer;
 import io.opentracing.propagation.Format;
-import io.opentracing.propagation.TextMapInjectAdapter;
+import io.opentracing.propagation.TextMapAdapter;
 import io.opentracing.tag.Tags;
 import io.opentracing.util.GlobalTracer;
 
@@ -65,11 +65,11 @@ public void filter(ClientRequestContext requestContext) throws IOException {
         if (property != null && property instanceof SpanContext) {
             spanBuilder = spanBuilder.asChildOf((SpanContext) property);
         }
-        Span span = spanBuilder.startManual();
+        Span span = spanBuilder.start();
 
         requestContext.setProperty(OpenTracingFeature.SPAN_CONTEXT_PROPERTY, span);
         Map<String, String> addedHeaders = new HashMap<>();
-        GlobalTracer.get().inject(span.context(), Format.Builtin.HTTP_HEADERS, new TextMapInjectAdapter(addedHeaders));
+        GlobalTracer.get().inject(span.context(), Format.Builtin.HTTP_HEADERS, new TextMapAdapter(addedHeaders));
         addedHeaders.forEach((key, value) -> requestContext.getHeaders().add(key, value));
     }
 }
diff --git a/incubator/open-tracing/src/main/java/org/glassfish/jersey/opentracing/OpenTracingUtils.java b/incubator/open-tracing/src/main/java/org/glassfish/jersey/opentracing/OpenTracingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -89,7 +89,7 @@ public static Span getRequestChildSpan(final ContainerRequestContext context, fi
                 spanBuilder = spanBuilder.asChildOf((Span) spanProperty);
             }
         }
-        return spanBuilder.startManual();
+        return spanBuilder.start();
     }
 
     /**