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 2018/12/12 16:01:04 UTC
[05/10] tomee git commit: TOMEE-2354 - Update all MP TCK to execute
on TomEE Plus with a build profile.
TOMEE-2354 - Update all MP TCK to execute on TomEE Plus with a build profile.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3948d2b7
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3948d2b7
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3948d2b7
Branch: refs/heads/master
Commit: 3948d2b7972e2a3168469e69cb945af970758604
Parents: af409ec
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Tue Dec 11 19:28:28 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Dec 11 19:28:28 2018 +0000
----------------------------------------------------------------------
tck/microprofile-tck/fault-tolerance/pom.xml | 27 ++++++++++++
.../src/test/resources/arquillian.xml | 15 ++++++-
tck/microprofile-tck/health/pom.xml | 27 ++++++++++++
.../health/src/test/resources/arquillian.xml | 15 ++++++-
tck/microprofile-tck/jwt/pom.xml | 30 ++++++++++++-
.../jwt/src/test/resources/arquillian.xml | 46 +++++++++++++-------
tck/microprofile-tck/metrics/pom.xml | 27 ++++++++++++
.../metrics/src/test/resources/arquillian.xml | 18 +++++++-
tck/microprofile-tck/openapi/pom.xml | 28 +++++++++++-
.../openapi/src/test/resources/arquillian.xml | 19 +++++++-
tck/microprofile-tck/opentracing/pom.xml | 27 ++++++++++++
.../src/test/resources/arquillian.xml | 15 ++++++-
tck/microprofile-tck/rest-client/pom.xml | 27 ++++++++++++
.../src/test/resources/arquillian.xml | 18 +++++++-
14 files changed, 308 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/3948d2b7/tck/microprofile-tck/fault-tolerance/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/fault-tolerance/pom.xml b/tck/microprofile-tck/fault-tolerance/pom.xml
index eaa237a..43a82c0 100644
--- a/tck/microprofile-tck/fault-tolerance/pom.xml
+++ b/tck/microprofile-tck/fault-tolerance/pom.xml
@@ -44,6 +44,33 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3948d2b7/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
----------------------------------------------------------------------
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 414f1d5..a23fae3 100644
--- a/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
@@ -21,9 +21,8 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-remote" default="true">
+ <container qualifier="tomee-microprofile" default="true">
<configuration>
- <property name="debug">false</property>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
@@ -34,4 +33,16 @@
<property name="cleanOnStartUp">true</property>
</configuration>
</container>
+ <container qualifier="tomee-plus">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">plus</property>
+ <property name="conf">src/test/conf</property>
+ <property name="dir">target/tomee</property>
+ <property name="appWorkingDir">target/workdir</property>
+ <property name="cleanOnStartUp">true</property>
+ </configuration>
+ </container>
</arquillian>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3948d2b7/tck/microprofile-tck/health/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/health/pom.xml b/tck/microprofile-tck/health/pom.xml
index 793fa07..9159c3e 100644
--- a/tck/microprofile-tck/health/pom.xml
+++ b/tck/microprofile-tck/health/pom.xml
@@ -44,6 +44,33 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3948d2b7/tck/microprofile-tck/health/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/health/src/test/resources/arquillian.xml b/tck/microprofile-tck/health/src/test/resources/arquillian.xml
index 414f1d5..a23fae3 100644
--- a/tck/microprofile-tck/health/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/health/src/test/resources/arquillian.xml
@@ -21,9 +21,8 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-remote" default="true">
+ <container qualifier="tomee-microprofile" default="true">
<configuration>
- <property name="debug">false</property>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
@@ -34,4 +33,16 @@
<property name="cleanOnStartUp">true</property>
</configuration>
</container>
+ <container qualifier="tomee-plus">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">plus</property>
+ <property name="conf">src/test/conf</property>
+ <property name="dir">target/tomee</property>
+ <property name="appWorkingDir">target/workdir</property>
+ <property name="cleanOnStartUp">true</property>
+ </configuration>
+ </container>
</arquillian>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3948d2b7/tck/microprofile-tck/jwt/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index d25b4b5..6c71438 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -145,7 +145,6 @@
<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 -->
@@ -158,7 +157,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.17</version>
<executions>
<execution>
<id>generate-test-report</id>
@@ -175,4 +173,32 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3948d2b7/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml b/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml
index ec0be8a..53f569c 100644
--- a/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml
@@ -21,20 +21,34 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-<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>
- <property name="classifier">microprofile</property>
- <property name="conf">src/test/conf</property>
- <property name="dir">target/tomee</property>
- <property name="appWorkingDir">target/workdir</property>
- <property name="cleanOnStartUp">true</property>
- <property name="properties">
- org.apache.webbeans.component.PrincipalBean.proxy=false
- </property>
- </configuration>
-</container>
+ <container qualifier="tomee-microprofile" default="true">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">microprofile</property>
+ <property name="conf">src/test/conf</property>
+ <property name="dir">target/tomee</property>
+ <property name="appWorkingDir">target/workdir</property>
+ <property name="cleanOnStartUp">true</property>
+ <property name="properties">
+ org.apache.webbeans.component.PrincipalBean.proxy=false
+ </property>
+ </configuration>
+ </container>
+ <container qualifier="tomee-plus">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">plus</property>
+ <property name="conf">src/test/conf</property>
+ <property name="dir">target/tomee</property>
+ <property name="appWorkingDir">target/workdir</property>
+ <property name="cleanOnStartUp">true</property>
+ <property name="properties">
+ org.apache.webbeans.component.PrincipalBean.proxy=false
+ </property>
+ </configuration>
+ </container>
</arquillian>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3948d2b7/tck/microprofile-tck/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/metrics/pom.xml b/tck/microprofile-tck/metrics/pom.xml
index 0a7a1a7..e339279 100644
--- a/tck/microprofile-tck/metrics/pom.xml
+++ b/tck/microprofile-tck/metrics/pom.xml
@@ -52,6 +52,33 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3948d2b7/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml b/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml
index 7804dcd..79e9905 100644
--- a/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml
@@ -21,9 +21,8 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-remote" default="true">
+ <container qualifier="tomee-microprofile" default="true">
<configuration>
- <property name="debug">false</property>
<property name="httpPort">50290</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
@@ -37,4 +36,19 @@
</property>
</configuration>
</container>
+ <container qualifier="tomee-plus">
+ <configuration>
+ <property name="httpPort">50290</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">plus</property>
+ <property name="conf">src/test/conf</property>
+ <property name="dir">target/tomee</property>
+ <property name="appWorkingDir">target/workdir</property>
+ <property name="cleanOnStartUp">true</property>
+ <property name="properties">
+ MP_METRICS_TAGS = tier=integration
+ </property>
+ </configuration>
+ </container>
</arquillian>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3948d2b7/tck/microprofile-tck/openapi/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/openapi/pom.xml b/tck/microprofile-tck/openapi/pom.xml
index 5a9bffb..6b7fcd8 100644
--- a/tck/microprofile-tck/openapi/pom.xml
+++ b/tck/microprofile-tck/openapi/pom.xml
@@ -36,7 +36,6 @@
<!-- 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>
@@ -57,6 +56,33 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3948d2b7/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
index b592607..4b9d334 100644
--- a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
@@ -21,9 +21,8 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-remote" default="true">
+ <container qualifier="tomee-microprofile" default="true">
<configuration>
- <property name="debug">false</property>
<property name="httpPort">50290</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
@@ -38,4 +37,20 @@
</property>
</configuration>
</container>
+ <container qualifier="tomee-plus">
+ <configuration>
+ <property name="httpPort">50290</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">plus</property>
+ <property name="conf">src/test/conf</property>
+ <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>
</arquillian>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3948d2b7/tck/microprofile-tck/opentracing/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/opentracing/pom.xml b/tck/microprofile-tck/opentracing/pom.xml
index cb9124b..99a4e6d 100644
--- a/tck/microprofile-tck/opentracing/pom.xml
+++ b/tck/microprofile-tck/opentracing/pom.xml
@@ -44,6 +44,33 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3948d2b7/tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml b/tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml
index b1d77a6..401b6bb 100644
--- a/tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml
@@ -20,9 +20,8 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-remote" default="true">
+ <container qualifier="tomee-microprofile" default="true">
<configuration>
- <property name="debug">false</property>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
@@ -33,4 +32,16 @@
<property name="cleanOnStartUp">true</property>
</configuration>
</container>
+ <container qualifier="tomee-plus">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">plus</property>
+ <property name="conf">src/test/conf</property>
+ <property name="dir">target/tomee</property>
+ <property name="appWorkingDir">target/workdir</property>
+ <property name="cleanOnStartUp">true</property>
+ </configuration>
+ </container>
</arquillian>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3948d2b7/tck/microprofile-tck/rest-client/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml
index 53e53e8..f94276a 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -70,6 +70,33 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3948d2b7/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
----------------------------------------------------------------------
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 2791939..1534c1c 100644
--- a/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
@@ -21,9 +21,8 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-remote" default="true">
+ <container qualifier="tomee-microprofile" default="true">
<configuration>
- <property name="debug">false</property>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
@@ -37,4 +36,19 @@
</property>
</configuration>
</container>
+ <container qualifier="tomee-plus">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">plus</property>
+ <property name="conf">src/test/conf</property>
+ <property name="dir">target/tomee</property>
+ <property name="appWorkingDir">target/workdir</property>
+ <property name="cleanOnStartUp">true</property>
+ <property name="additionalLibs">
+ mvn:com.github.tomakehurst:wiremock-standalone:2.10.1
+ </property>
+ </configuration>
+ </container>
</arquillian>