You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2022/04/15 14:00:23 UTC
[tomee] branch master updated: TOMEE-3909 Fix TCK and pass MicroProfile Rest Client TCK
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 ef30d8f8e9 TOMEE-3909 Fix TCK and pass MicroProfile Rest Client TCK
ef30d8f8e9 is described below
commit ef30d8f8e90922c5724850340c218607430cbbcd
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Fri Apr 15 16:00:13 2022 +0200
TOMEE-3909 Fix TCK and pass MicroProfile Rest Client TCK
---
tck/microprofile-tck/rest-client/pom.xml | 33 +++++++++++++---------
.../MicroProfileRestClientTCKArchiveProcessor.java | 3 ++
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml
index b509fb3a80..79d1058486 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -28,6 +28,11 @@
<artifactId>microprofile-rest-client-tck</artifactId>
<name>TomEE :: TCK :: MicroProfile Rest Client TCK</name>
+ <properties>
+ <!--<jetty-tck.version>${jetty.version}</jetty-tck.version>-->
+ <jetty-tck.version>9.2.28.v20190418</jetty-tck.version>
+ </properties>
+
<build>
<plugins>
@@ -157,60 +162,60 @@
<artifactId>wiremock</artifactId>
<version>2.10.1</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>11.0.6</version>
+ <version>${jetty-tck.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>11.0.6</version>
+ <version>${jetty-tck.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>11.0.6</version>
+ <version>${jetty-tck.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>11.0.6</version>
+ <version>${jetty-tck.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>11.0.6</version>
+ <version>${jetty-tck.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
- <version>11.0.6</version>
+ <version>${jetty-tck.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>11.0.6</version>
+ <version>${jetty-tck.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>11.0.6</version>
+ <version>${jetty-tck.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ <version>${jetty-tck.version}</version>
<scope>test</scope>
</dependency>
diff --git a/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java b/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java
index 8deb9e34e2..623f4365bb 100644
--- a/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java
+++ b/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java
@@ -37,6 +37,9 @@ public class MicroProfileRestClientTCKArchiveProcessor implements ApplicationArc
WebArchive webArchive = (WebArchive) archive;
webArchive.addAsLibrary(JarLocation.jarLocation(org.eclipse.jetty.server.Handler.class));
+ webArchive.addAsLibrary(JarLocation.jarLocation(org.eclipse.jetty.util.component.LifeCycle.class));
+ webArchive.addAsLibrary(JarLocation.jarLocation(org.eclipse.jetty.http.HttpField.class));
+ webArchive.addAsLibrary(JarLocation.jarLocation(org.eclipse.jetty.io.ByteBufferPool.class));
webArchive.addAsWebInfResource(new StringAsset(""), "beans.xml");
final Map<ArchivePath, Node> content = webArchive.getContent();