Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MicroProfile Opentracing 2.0 #2676

Merged
merged 3 commits into from
Jan 25, 2021
Merged

MicroProfile Opentracing 2.0 #2676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e28fe2
Microprofile Opentracing uprgated to 2.0
dalexandrov Jan 20, 2021
7cb27ef
More dependences removed.
dalexandrov Jan 20, 2021
9c6806f
Codestyle.
dalexandrov Jan 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<version.lib.microprofile-reactive-streams-operators-api>1.0.1</version.lib.microprofile-reactive-streams-operators-api>
<version.lib.microprofile-reactive-streams-operators-core>1.0.1</version.lib.microprofile-reactive-streams-operators-core>
<version.lib.microprofile-rest-client>1.4.1</version.lib.microprofile-rest-client>
<version.lib.microprofile-tracing>1.3.3</version.lib.microprofile-tracing>
<version.lib.microprofile-tracing>2.0</version.lib.microprofile-tracing>
<version.lib.mockito>2.23.4</version.lib.mockito>
<version.lib.mongodb.reactivestreams>1.11.0</version.lib.mongodb.reactivestreams>
<version.lib.mssql-jdbc>8.4.1.jre8</version.lib.mssql-jdbc>
Expand Down Expand Up @@ -613,12 +613,6 @@
<groupId>org.eclipse.microprofile.opentracing</groupId>
<artifactId>microprofile-opentracing-api</artifactId>
<version>${version.lib.microprofile-tracing}</version>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation.versioning</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.rest.client</groupId>
Expand Down
59 changes: 0 additions & 59 deletions microprofile/tests/tck/tck-opentracing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,37 +27,20 @@
<artifactId>tck-opentracing</artifactId>
<name>Helidon Microprofile Tests TCK Opentracing</name>

<properties>
<!-- 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>
Expand Down Expand Up @@ -90,35 +73,6 @@
<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 @@ -131,19 +85,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