Skip to content

Commit

Permalink
Enable OpenTracing 2.0 TCKs for Helidon 3.x (#3962)
Browse files Browse the repository at this point in the history
* enable TCK

* POM clean up

* POM – get rid of workarounds
  • Loading branch information
dalexandrov authored Mar 15, 2022
1 parent 799ebd2 commit b81b414
Showing 1 changed file with 3 additions and 81 deletions.
84 changes: 3 additions & 81 deletions microprofile/tests/tck/tck-opentracing/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019, 2021 Oracle and/or its affiliates.
Copyright (c) 2019, 2022 Oracle and/or its affiliates.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -16,8 +16,8 @@
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>tck-project</artifactId>
Expand All @@ -27,100 +27,35 @@
<artifactId>tck-opentracing</artifactId>
<name>Helidon Microprofile Tests TCK Opentracing</name>

<properties>
<!-- 3.0.0-JAKARTA -->
<skipTests>true</skipTests>
<!-- We force the version of jackson to 2.9.0 since that's -->
<!-- what the TCK test forces us to use (via shrinkwrap) -->
<version.lib.jackson>2.9.0</version.lib.jackson>
</properties>

<dependencies>
<dependency>
<groupId>io.helidon.microprofile.tests</groupId>
<artifactId>helidon-arquillian</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<!-- TCK requires Jackson, not JSON-B -->
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-binding</artifactId>
</exclusion>
<exclusion>
<!-- we must remove security tracing -->
<groupId>io.helidon.security.integration</groupId>
<artifactId>helidon-security-integration-jersey-client</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- The TCK depends on unmarshalling using Jackson -->
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.opentracing</groupId>
<artifactId>microprofile-opentracing-tck</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.opentracing</groupId>
<artifactId>microprofile-opentracing-tck-rest-client</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-mock</artifactId>
<scope>test</scope>
</dependency>
<!--
Override dependency versions for jackson-jaxrs-provider to
workaround proxy issues with shrinkwrap maven.
-->
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -133,19 +68,6 @@
<suiteXmlFile>tck-suite.xml</suiteXmlFile>
</suiteXmlFiles>
</configuration>
<dependencies>
<!--
Forcing resolution of opentracing-api:0.31.0
to workaround proxy issues with shrinkwrap maven.
Cannot override managed version of opentracing-api since
0.31.0 is not compatible with Helidon
-->
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
<version>0.31.0</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down

0 comments on commit b81b414

Please sign in to comment.