This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 9da9091 MicroProfile TCK upgrade to support jakarta namespace. Let's
see how far we are from API/IMPL
9da9091 is described below
commit 9da909107362802764691a5fdf5cecc430e88c5d
Author: Jean-Louis Monteiro <jlmonte...@tomitribe.com>
AuthorDate: Wed Mar 30 23:39:05 2022 +0200
MicroProfile TCK upgrade to support jakarta namespace. Let's see how far we
are from API/IMPL
---
pom.xml | 8 ++++++++
tck/microprofile-tck/config/pom.xml | 8 +++++++-
tck/microprofile-tck/fault-tolerance/pom.xml | 11 ++++++++---
tck/microprofile-tck/health/pom.xml | 6 +++++-
tck/microprofile-tck/jwt/pom.xml | 8 ++++++--
tck/microprofile-tck/metrics/pom.xml | 8 +++++++-
tck/microprofile-tck/openapi/pom.xml | 13 ++++++++++++-
tck/microprofile-tck/opentracing/pom.xml | 10 ++++++++--
.../MicroProfileOpenTrackingContextResolver.java | 5 ++---
.../OpenTracingJacksonMapperTest.java | 4 ++--
tck/microprofile-tck/rest-client/pom.xml | 6 +++++-
11 files changed, 70 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 871e677..6cabf01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,21 +225,29 @@
<!-- Micro Profile -->
<microprofile.version>2.0</microprofile.version>
<microprofile.config.version>1.3</microprofile.config.version>
+ <microprofile.config.tck.version>3.0.1</microprofile.config.tck.version>
<microprofile.config.impl.version>1.2.3</microprofile.config.impl.version>
<microprofile.jwt.version>2.0</microprofile.jwt.version>
+ <microprofile.jwt.tck.version>2.0</microprofile.jwt.tck.version>
<microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
<!-- 1.1 Implementation not started yet -->
<microprofile.fault-tolerance.version>1.1.4</microprofile.fault-tolerance.version>
+
<microprofile.fault-tolerance.tck.version>4.0</microprofile.fault-tolerance.tck.version>
<microprofile.fault-tolerance.impl.version>1.2.1</microprofile.fault-tolerance.impl.version>
<microprofile.health.version>3.0-RC3</microprofile.health.version>
+ <microprofile.health.tck.version>4.0</microprofile.health.tck.version>
<microprofile.health.impl.version>2.0.1</microprofile.health.impl.version>
<microprofile.metrics.version>3.0.1</microprofile.metrics.version>
+ <microprofile.metrics.tck.version>4.0.1</microprofile.metrics.tck.version>
<microprofile.metrics.impl.version>1.0.6</microprofile.metrics.impl.version>
<microprofile.rest-client.version>1.3.3</microprofile.rest-client.version>
+
<microprofile.rest-client.tck.version>3.0</microprofile.rest-client.tck.version>
<microprofile.rest-client.impl.version>${cxf.version}</microprofile.rest-client.impl.version>
<microprofile.openapi.version>1.1.2</microprofile.openapi.version>
+ <microprofile.openapi.tck.version>3.0</microprofile.openapi.tck.version>
<microprofile.openapi.impl.version>1.0.15</microprofile.openapi.impl.version>
<microprofile.opentracing.version>1.1.2</microprofile.opentracing.version>
+
<microprofile.opentracing.tck.version>3.0</microprofile.opentracing.tck.version>
<microprofile.opentracing.impl.version>1.0.3</microprofile.opentracing.impl.version>
<opentracing.api>0.31.0</opentracing.api>
diff --git a/tck/microprofile-tck/config/pom.xml
b/tck/microprofile-tck/config/pom.xml
index 39c3ab6..ad8484a 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -101,12 +101,18 @@
<artifactId>microprofile-config-api-shade</artifactId>
<version>${project.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.microprofile.config</groupId>
+ <artifactId>microprofile-config-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
<artifactId>microprofile-config-tck</artifactId>
- <version>${microprofile.config.version}</version>
+ <version>${microprofile.config.tck.version}</version>
<scope>test</scope>
</dependency>
diff --git a/tck/microprofile-tck/fault-tolerance/pom.xml
b/tck/microprofile-tck/fault-tolerance/pom.xml
index 74c20a9..7ccddd5 100644
--- a/tck/microprofile-tck/fault-tolerance/pom.xml
+++ b/tck/microprofile-tck/fault-tolerance/pom.xml
@@ -88,12 +88,18 @@
<artifactId>microprofile-fault-tolerance-api-shade</artifactId>
<version>${project.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.fault-tolerance</groupId>
<artifactId>microprofile-fault-tolerance-tck</artifactId>
- <version>${microprofile.fault-tolerance.version}</version>
+ <version>${microprofile.fault-tolerance.tck.version}</version>
<scope>test</scope>
</dependency>
@@ -109,8 +115,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.14.3</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/tck/microprofile-tck/health/pom.xml
b/tck/microprofile-tck/health/pom.xml
index aebb5fb..2f9b6c9 100644
--- a/tck/microprofile-tck/health/pom.xml
+++ b/tck/microprofile-tck/health/pom.xml
@@ -91,13 +91,17 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.health</groupId>
<artifactId>microprofile-health-tck</artifactId>
- <version>${microprofile.health.version}</version>
+ <version>${microprofile.health.tck.version}</version>
<scope>test</scope>
</dependency>
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index a04fb49..140c7e9 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -53,6 +53,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>*</artifactId>
</exclusion>
@@ -92,7 +96,7 @@
<dependency>
<groupId>org.eclipse.microprofile.jwt</groupId>
<artifactId>microprofile-jwt-auth-tck</artifactId>
- <version>${microprofile.jwt.version}</version>
+ <version>${microprofile.jwt.tck.version</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -106,7 +110,7 @@
<dependency>
<groupId>org.eclipse.microprofile.jwt</groupId>
<artifactId>microprofile-jwt-auth-tck</artifactId>
- <version>${microprofile.jwt.version}</version>
+ <version>${microprofile.jwt.tck.version</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/tck/microprofile-tck/metrics/pom.xml
b/tck/microprofile-tck/metrics/pom.xml
index 3af9b3a..5f82ee6 100644
--- a/tck/microprofile-tck/metrics/pom.xml
+++ b/tck/microprofile-tck/metrics/pom.xml
@@ -95,6 +95,12 @@
<artifactId>microprofile-metrics-api-shade</artifactId>
<version>${project.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -113,7 +119,7 @@
<dependency>
<groupId>org.eclipse.microprofile.metrics</groupId>
<artifactId>microprofile-metrics-rest-tck</artifactId>
- <version>${microprofile.metrics.version}</version>
+ <version>${microprofile.metrics.tck.version}</version>
<scope>test</scope>
</dependency>
diff --git a/tck/microprofile-tck/openapi/pom.xml
b/tck/microprofile-tck/openapi/pom.xml
index bab5f7e..d5d8d59 100644
--- a/tck/microprofile-tck/openapi/pom.xml
+++ b/tck/microprofile-tck/openapi/pom.xml
@@ -99,12 +99,18 @@
<artifactId>microprofile-openapi-api-shade</artifactId>
<version>${project.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.microprofile.openapi</groupId>
+ <artifactId>microprofile-openapi-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.openapi</groupId>
<artifactId>microprofile-openapi-tck</artifactId>
- <version>${microprofile.openapi.version}</version>
+ <version>${microprofile.openapi.tck.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -126,6 +132,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
+ <version>6.14.3</version>
<scope>test</scope>
</dependency>
@@ -143,6 +150,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>*</artifactId>
</exclusion>
diff --git a/tck/microprofile-tck/opentracing/pom.xml
b/tck/microprofile-tck/opentracing/pom.xml
index 627252c..3829937 100644
--- a/tck/microprofile-tck/opentracing/pom.xml
+++ b/tck/microprofile-tck/opentracing/pom.xml
@@ -87,12 +87,18 @@
<artifactId>microprofile-opentracing-api-shade</artifactId>
<version>${project.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.opentracing</groupId>
<artifactId>microprofile-opentracing-tck</artifactId>
- <version>${microprofile.opentracing.version}</version>
+ <version>${microprofile.opentracing.tck.version}</version>
<scope>test</scope>
</dependency>
@@ -135,7 +141,7 @@
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.9.0</version>
+ <version>2.13.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git
a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTrackingContextResolver.java
b/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTrackingContextResolver.java
index 69467ff..6d0bd39 100644
---
a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTrackingContextResolver.java
+++
b/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTrackingContextResolver.java
@@ -16,11 +16,10 @@
*/
package org.apache.tomee.microprofile.tck.opentracing;
-import org.codehaus.jackson.map.ObjectMapper;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.ws.rs.ext.ContextResolver;
-import static
org.codehaus.jackson.map.DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES;
+import static
com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
public class MicroProfileOpenTrackingContextResolver implements
ContextResolver<ObjectMapper>{
@Override
diff --git
a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/OpenTracingJacksonMapperTest.java
b/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/OpenTracingJacksonMapperTest.java
index 39698ae..11c707a 100644
---
a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/OpenTracingJacksonMapperTest.java
+++
b/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/OpenTracingJacksonMapperTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tomee.microprofile.tck.opentracing;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.eclipse.microprofile.opentracing.tck.tracer.TestTracer;
import org.testng.annotations.Test;
-import static
org.codehaus.jackson.map.DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES;
+import static
com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
public class OpenTracingJacksonMapperTest {
@Test
diff --git a/tck/microprofile-tck/rest-client/pom.xml
b/tck/microprofile-tck/rest-client/pom.xml
index 094a78c..e1a433e 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -122,13 +122,17 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.microprofile.rest.client</groupId>
+ <artifactId>microprofile-rest-client-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.rest.client</groupId>
<artifactId>microprofile-rest-client-tck</artifactId>
- <version>${microprofile.rest-client.version}</version>
+ <version>${microprofile.rest-client.tck.version}</version>
<scope>test</scope>
</dependency>
