Dependency Convergence validation

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
senivam · Aug 28, 2024 · 0ac9c96 · 0ac9c96
1 parent 5c05f15
commit 0ac9c96
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/examples/groovy/pom.xml b/examples/groovy/pom.xml
@@ -42,6 +42,14 @@
                     <groupId>org.junit.jupiter</groupId>
                     <artifactId>junit-jupiter-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter-engine</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.junit.platform</groupId>
+                    <artifactId>junit-platform-commons</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

diff --git a/...assfish/jersey/micrometer/server/observation/ObservationApplicationEventListenerTest.java b/...assfish/jersey/micrometer/server/observation/ObservationApplicationEventListenerTest.java
@@ -45,7 +45,6 @@
 import io.micrometer.tracing.otel.bridge.OtelTracer;
 import io.micrometer.tracing.otel.bridge.Slf4JBaggageEventListener;
 import io.micrometer.tracing.otel.bridge.Slf4JEventListener;
-import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.exporter.zipkin.ZipkinSpanExporterBuilder;
@@ -56,6 +55,7 @@
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
 import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
+import io.opentelemetry.semconv.ResourceAttributes;
 import org.glassfish.jersey.micrometer.server.ObservationApplicationEventListener;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Nested;
@@ -64,7 +64,6 @@
 import zipkin2.reporter.brave.ZipkinSpanHandler;
 
 import static io.opentelemetry.sdk.trace.samplers.Sampler.alwaysOn;
-import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME;
 
 /**
  * Tests for {@link ObservationApplicationEventListener}.
@@ -152,7 +151,7 @@ void configureRegistry(ObservationRegistry registry) {
             SdkTracerProviderBuilder builder = SdkTracerProvider.builder()
                     .setSampler(alwaysOn())
                     .addSpanProcessor(processor)
-                    .setResource(Resource.create(Attributes.of(SERVICE_NAME, "otel-test")));
+                    .setResource(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, "otel-test")));
 
             if (isZipkinAvailable()) {
                 builder.addSpanProcessor(SimpleSpanProcessor.create(spanExporter));

diff --git a/media/json-gson/pom.xml b/media/json-gson/pom.xml
@@ -75,6 +75,12 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.errorprone</groupId>
+                    <artifactId>error_prone_annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/pom.xml b/pom.xml
@@ -2190,7 +2190,7 @@
         <graalvm.version>20.3.14</graalvm.version>
 
         <!-- do not need CQs (below this line till the end of version properties)-->
-        <gf.impl.version>8.0.0-JDK17-M7</gf.impl.version>
+        <gf.impl.version>8.0.0-JDK17-M6</gf.impl.version>
         <!-- Jakartified -->
         <cdi.api.version>4.1.0</cdi.api.version>
         <cdi.osgi.version>jakarta.enterprise.*;version="[4.0,5)"</cdi.osgi.version>
@@ -2201,7 +2201,7 @@
         <hk2.version>4.0.0-M3</hk2.version>
         <hk2.osgi.version>org.glassfish.hk2.*;version="[4.0,5)"</hk2.osgi.version>
         <hk2.jvnet.osgi.version>org.jvnet.hk2.*;version="[4.0,5)"</hk2.jvnet.osgi.version>
-        <hk2.config.version>8.0.0-JDK17-M7</hk2.config.version>
+        <hk2.config.version>8.0.0-JDK17-M6</hk2.config.version>
         <jsp.version>4.0.0-M2</jsp.version>
         <jstl.version>3.0.1</jstl.version>
         <jta.api.version>2.0.1</jta.api.version>