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 2019/07/22 13:07:05 UTC
[tomee] 06/31: Revert "TOMEE-2354 - Update all MP TCK to execute on
TomEE Plus with a build profile."
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch tomee8-java11
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit e476eae1853448a94565ceb9496049a2df2e0457
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Dec 19 01:22:21 2018 +0000
Revert "TOMEE-2354 - Update all MP TCK to execute on TomEE Plus with a build profile."
This reverts commit 3948d2b7972e2a3168469e69cb945af970758604.
---
tck/microprofile-tck/fault-tolerance/pom.xml | 27 -------------------
.../src/test/resources/arquillian.xml | 3 ++-
tck/microprofile-tck/health/pom.xml | 27 -------------------
.../health/src/test/resources/arquillian.xml | 3 ++-
tck/microprofile-tck/jwt/pom.xml | 30 ++--------------------
tck/microprofile-tck/metrics/pom.xml | 27 -------------------
.../metrics/src/test/resources/arquillian.xml | 3 ++-
tck/microprofile-tck/openapi/pom.xml | 28 +-------------------
.../openapi/src/test/resources/arquillian.xml | 7 ++++-
tck/microprofile-tck/opentracing/pom.xml | 27 -------------------
.../opentracing/src/test/resources/arquillian.xml | 3 ++-
tck/microprofile-tck/rest-client/pom.xml | 27 -------------------
.../rest-client/src/test/resources/arquillian.xml | 3 ++-
13 files changed, 19 insertions(+), 196 deletions(-)
diff --git a/tck/microprofile-tck/fault-tolerance/pom.xml b/tck/microprofile-tck/fault-tolerance/pom.xml
index 4fc0ad4..aa95c3d 100644
--- a/tck/microprofile-tck/fault-tolerance/pom.xml
+++ b/tck/microprofile-tck/fault-tolerance/pom.xml
@@ -44,33 +44,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>mp-tck-all</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>tomee-plus</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <arquillian.launch>tomee-plus</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile.fault-tolerance</groupId>
diff --git a/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml b/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
index 9fc654b..2eee01c 100644
--- a/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
@@ -21,8 +21,9 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-microprofile" default="true">
+ <container qualifier="tomee-remote" default="true">
<configuration>
+ <property name="debug">false</property>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
diff --git a/tck/microprofile-tck/health/pom.xml b/tck/microprofile-tck/health/pom.xml
index 62dee30..973472a 100644
--- a/tck/microprofile-tck/health/pom.xml
+++ b/tck/microprofile-tck/health/pom.xml
@@ -43,33 +43,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>mp-tck-all</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>tomee-plus</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <arquillian.launch>tomee-plus</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile.health</groupId>
diff --git a/tck/microprofile-tck/health/src/test/resources/arquillian.xml b/tck/microprofile-tck/health/src/test/resources/arquillian.xml
index 9fc654b..2eee01c 100644
--- a/tck/microprofile-tck/health/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/health/src/test/resources/arquillian.xml
@@ -21,8 +21,9 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-microprofile" default="true">
+ <container qualifier="tomee-remote" default="true">
<configuration>
+ <property name="debug">false</property>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index eb6dd19..a0e9ed2 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -172,6 +172,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.17</version>
<configuration>
<suiteXmlFiles>
<!-- TCK does not deliver the xml file for the moment -->
@@ -184,6 +185,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.17</version>
<executions>
<execution>
<id>generate-test-report</id>
@@ -200,32 +202,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>mp-tck-all</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>tomee-plus</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <arquillian.launch>tomee-plus</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/tck/microprofile-tck/metrics/pom.xml b/tck/microprofile-tck/metrics/pom.xml
index c5fc0c3..9d77818 100644
--- a/tck/microprofile-tck/metrics/pom.xml
+++ b/tck/microprofile-tck/metrics/pom.xml
@@ -51,33 +51,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>mp-tck-all</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>tomee-plus</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <arquillian.launch>tomee-plus</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile.metrics</groupId>
diff --git a/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml b/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml
index ce97b1d..d585110 100644
--- a/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml
@@ -21,8 +21,9 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-microprofile" default="true">
+ <container qualifier="tomee-remote" default="true">
<configuration>
+ <property name="debug">false</property>
<property name="httpPort">50290</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
diff --git a/tck/microprofile-tck/openapi/pom.xml b/tck/microprofile-tck/openapi/pom.xml
index 5b6279d..44861b0 100644
--- a/tck/microprofile-tck/openapi/pom.xml
+++ b/tck/microprofile-tck/openapi/pom.xml
@@ -35,6 +35,7 @@
<!-- Updated version to fix hanging text -->
<version>2.22.0</version>
<configuration>
+ <!-- TODO - Requires the JsonB JAX-RS Provider -->
<dependenciesToScan>
<dependency>org.eclipse.microprofile.openapi:microprofile-openapi-tck</dependency>
</dependenciesToScan>
@@ -55,33 +56,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>mp-tck-all</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>tomee-plus</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <arquillian.launch>tomee-plus</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile.openapi</groupId>
diff --git a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
index 6b3b59a..33d3df5 100644
--- a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
@@ -21,8 +21,9 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-microprofile" default="true">
+ <container qualifier="tomee-remote" default="true">
<configuration>
+ <property name="debug">false</property>
<property name="httpPort">50290</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
@@ -31,6 +32,10 @@
<property name="dir">target/tomee</property>
<property name="appWorkingDir">target/workdir</property>
<property name="cleanOnStartUp">true</property>
+ <property name="properties">
+ <!-- TODO - The final dist should include this property -->
+ openejb.cxf-rs.cache-application = false
+ </property>
</configuration>
</container>
<container qualifier="tomee-plus">
diff --git a/tck/microprofile-tck/opentracing/pom.xml b/tck/microprofile-tck/opentracing/pom.xml
index 09ca8a9..73b3662 100644
--- a/tck/microprofile-tck/opentracing/pom.xml
+++ b/tck/microprofile-tck/opentracing/pom.xml
@@ -43,33 +43,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>mp-tck-all</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>tomee-plus</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <arquillian.launch>tomee-plus</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile.opentracing</groupId>
diff --git a/tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml b/tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml
index 45f33f9..d5b5a0f 100644
--- a/tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml
@@ -20,8 +20,9 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-microprofile" default="true">
+ <container qualifier="tomee-remote" default="true">
<configuration>
+ <property name="debug">false</property>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml
index 2f7aa01..54df529 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -73,33 +73,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>mp-tck-all</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>tomee-plus</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <arquillian.launch>tomee-plus</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile.rest.client</groupId>
diff --git a/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml b/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
index e17f109..f46dedf 100644
--- a/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
@@ -21,8 +21,9 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-microprofile" default="true">
+ <container qualifier="tomee-remote" default="true">
<configuration>
+ <property name="debug">false</property>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>