Skip to content

Commit b81b414

Browse files
authored
Enable OpenTracing 2.0 TCKs for Helidon 3.x (helidon-io#3962)
* enable TCK * POM clean up * POM – get rid of workarounds
1 parent 799ebd2 commit b81b414

1 file changed

Lines changed: 3 additions & 81 deletions

File tree

  • microprofile/tests/tck/tck-opentracing

microprofile/tests/tck/tck-opentracing/pom.xml

Lines changed: 3 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2019, 2021 Oracle and/or its affiliates.
3+
Copyright (c) 2019, 2022 Oracle and/or its affiliates.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
1616
-->
1717

1818
<project xmlns="http://maven.apache.org/POM/4.0.0"
19-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2121
<modelVersion>4.0.0</modelVersion>
2222
<parent>
2323
<artifactId>tck-project</artifactId>
@@ -27,100 +27,35 @@
2727
<artifactId>tck-opentracing</artifactId>
2828
<name>Helidon Microprofile Tests TCK Opentracing</name>
2929

30-
<properties>
31-
<!-- 3.0.0-JAKARTA -->
32-
<skipTests>true</skipTests>
33-
<!-- We force the version of jackson to 2.9.0 since that's -->
34-
<!-- what the TCK test forces us to use (via shrinkwrap) -->
35-
<version.lib.jackson>2.9.0</version.lib.jackson>
36-
</properties>
37-
3830
<dependencies>
3931
<dependency>
4032
<groupId>io.helidon.microprofile.tests</groupId>
4133
<artifactId>helidon-arquillian</artifactId>
4234
<version>${project.version}</version>
4335
<scope>test</scope>
4436
<exclusions>
45-
<exclusion>
46-
<!-- TCK requires Jackson, not JSON-B -->
47-
<groupId>org.glassfish.jersey.media</groupId>
48-
<artifactId>jersey-media-json-binding</artifactId>
49-
</exclusion>
5037
<exclusion>
5138
<!-- we must remove security tracing -->
5239
<groupId>io.helidon.security.integration</groupId>
5340
<artifactId>helidon-security-integration-jersey-client</artifactId>
5441
</exclusion>
5542
</exclusions>
5643
</dependency>
57-
<dependency>
58-
<!-- The TCK depends on unmarshalling using Jackson -->
59-
<groupId>org.glassfish.jersey.media</groupId>
60-
<artifactId>jersey-media-json-jackson</artifactId>
61-
<scope>test</scope>
62-
</dependency>
63-
<dependency>
64-
<groupId>jakarta.xml.bind</groupId>
65-
<artifactId>jakarta.xml.bind-api</artifactId>
66-
<scope>test</scope>
67-
</dependency>
6844
<dependency>
6945
<groupId>org.eclipse.microprofile.opentracing</groupId>
7046
<artifactId>microprofile-opentracing-tck</artifactId>
7147
<scope>test</scope>
72-
<exclusions>
73-
<exclusion>
74-
<groupId>org.jboss.resteasy</groupId>
75-
<artifactId>resteasy-client</artifactId>
76-
</exclusion>
77-
</exclusions>
7848
</dependency>
7949
<dependency>
8050
<groupId>org.eclipse.microprofile.opentracing</groupId>
8151
<artifactId>microprofile-opentracing-tck-rest-client</artifactId>
8252
<scope>test</scope>
83-
<exclusions>
84-
<exclusion>
85-
<groupId>org.jboss.resteasy</groupId>
86-
<artifactId>resteasy-client</artifactId>
87-
</exclusion>
88-
</exclusions>
8953
</dependency>
9054
<dependency>
9155
<groupId>io.opentracing</groupId>
9256
<artifactId>opentracing-mock</artifactId>
9357
<scope>test</scope>
9458
</dependency>
95-
<!--
96-
Override dependency versions for jackson-jaxrs-provider to
97-
workaround proxy issues with shrinkwrap maven.
98-
-->
99-
<dependency>
100-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
101-
<artifactId>jackson-jaxrs-json-provider</artifactId>
102-
<scope>test</scope>
103-
</dependency>
104-
<dependency>
105-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
106-
<artifactId>jackson-jaxrs-base</artifactId>
107-
<scope>test</scope>
108-
</dependency>
109-
<dependency>
110-
<groupId>com.fasterxml.jackson.core</groupId>
111-
<artifactId>jackson-databind</artifactId>
112-
<scope>test</scope>
113-
</dependency>
114-
<dependency>
115-
<groupId>com.fasterxml.jackson.core</groupId>
116-
<artifactId>jackson-core</artifactId>
117-
<scope>test</scope>
118-
</dependency>
119-
<dependency>
120-
<groupId>com.fasterxml.jackson.module</groupId>
121-
<artifactId>jackson-module-jaxb-annotations</artifactId>
122-
<scope>test</scope>
123-
</dependency>
12459
</dependencies>
12560

12661
<build>
@@ -133,19 +68,6 @@
13368
<suiteXmlFile>tck-suite.xml</suiteXmlFile>
13469
</suiteXmlFiles>
13570
</configuration>
136-
<dependencies>
137-
<!--
138-
Forcing resolution of opentracing-api:0.31.0
139-
to workaround proxy issues with shrinkwrap maven.
140-
Cannot override managed version of opentracing-api since
141-
0.31.0 is not compatible with Helidon
142-
-->
143-
<dependency>
144-
<groupId>io.opentracing</groupId>
145-
<artifactId>opentracing-api</artifactId>
146-
<version>0.31.0</version>
147-
</dependency>
148-
</dependencies>
14971
</plugin>
15072
</plugins>
15173
</build>

0 commit comments

Comments
 (0)