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:21 UTC
[tomee] 22/31: Sync up with master
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 1c99e7c81b1b8931c2cc958c03457d0e24d5b950
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Mon Jan 7 17:27:15 2019 +0000
Sync up with master
---
pom.xml | 4 +-
tck/microprofile-tck/config/pom.xml | 38 +++++++++
.../config/src/test/resources/arquillian.xml | 34 +++++++-
tck/microprofile-tck/fault-tolerance/pom.xml | 38 +++++++++
.../src/test/resources/arquillian.xml | 27 ++++++-
tck/microprofile-tck/health/pom.xml | 38 +++++++++
.../health/src/test/resources/arquillian.xml | 27 ++++++-
tck/microprofile-tck/jwt/pom.xml | 41 +++++++++-
tck/microprofile-tck/metrics/pom.xml | 38 +++++++++
.../metrics/src/test/resources/arquillian.xml | 33 +++++++-
tck/microprofile-tck/openapi/pom.xml | 38 +++++++++
.../openapi/src/test/resources/arquillian.xml | 35 ++++++++-
tck/microprofile-tck/opentracing/pom.xml | 38 +++++++++
.../opentracing/src/test/resources/arquillian.xml | 27 ++++++-
tck/microprofile-tck/rest-client/pom.xml | 38 +++++++++
.../rest-client/src/test/resources/arquillian.xml | 33 +++++++-
.../src/main/resources/META-INF/plume/NOTICE | 23 ++++++
.../src/main/resources/META-INF/plus/NOTICE | 45 +++++++++++
.../src/main/resources/META-INF/NOTICE | 75 +++++++++++++++++-
.../src/main/resources/META-INF/NOTICE | 91 ++++++++++++++++++++++
20 files changed, 741 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0d4a030..dcdaf55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -215,10 +215,10 @@
<microprofile.opentracing.version>1.1</microprofile.opentracing.version>
<microprofile.opentracing.impl.version>1.0.0</microprofile.opentracing.impl.version>
<opentracing.api>0.31.0</opentracing.api>
-
+
<!-- Jackson required by OpenAPI Impl -->
<jackson.version>2.9.4</jackson.version>
-
+
<!-- Javadoc & Asciidoclet -->
<javadoc.version>3.0.1</javadoc.version>
<asciidoclet.version>1.5.0</asciidoclet.version>
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index 4cb8e45..4f5a270 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -48,6 +48,44 @@
</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>
+ <execution>
+ <id>tomee-plume</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <arquillian.launch>tomee-plume</arquillian.launch>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/tck/microprofile-tck/config/src/test/resources/arquillian.xml b/tck/microprofile-tck/config/src/test/resources/arquillian.xml
index f40d75f..47f422a 100644
--- a/tck/microprofile-tck/config/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/config/src/test/resources/arquillian.xml
@@ -21,7 +21,7 @@
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="httpPort">-1</property>
<property name="ajpPort">-1</property>
@@ -48,6 +48,38 @@
<property name="appWorkingDir">target/workdir</property>
<property name="cleanOnStartUp">true</property>
<property name="properties">
+ config.test = SUCCESS
+ org.apache.geronimo.config.configsource.SystemPropertyConfigSource.copy = false
+ </property>
+ </configuration>
+ </container>
+ <container qualifier="tomee-plume">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">plume</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">
+ config.test = SUCCESS
+ org.apache.geronimo.config.configsource.SystemPropertyConfigSource.copy = 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">
tomee.mp.scan = all
config.test = SUCCESS
org.apache.geronimo.config.configsource.SystemPropertyConfigSource.copy = false
diff --git a/tck/microprofile-tck/fault-tolerance/pom.xml b/tck/microprofile-tck/fault-tolerance/pom.xml
index aa95c3d..e8ba927 100644
--- a/tck/microprofile-tck/fault-tolerance/pom.xml
+++ b/tck/microprofile-tck/fault-tolerance/pom.xml
@@ -44,6 +44,44 @@
</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>
+ <execution>
+ <id>tomee-plume</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <arquillian.launch>tomee-plume</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 2eee01c..5557c92 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>
@@ -44,6 +43,30 @@
<property name="dir">target/tomee</property>
<property name="appWorkingDir">target/workdir</property>
<property name="cleanOnStartUp">true</property>
+ </configuration>
+ </container>
+ <container qualifier="tomee-plume">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">plume</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>
+ <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">
tomee.mp.scan = all
</property>
diff --git a/tck/microprofile-tck/health/pom.xml b/tck/microprofile-tck/health/pom.xml
index 973472a..084b693 100644
--- a/tck/microprofile-tck/health/pom.xml
+++ b/tck/microprofile-tck/health/pom.xml
@@ -43,6 +43,44 @@
</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>
+ <execution>
+ <id>tomee-plume</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <arquillian.launch>tomee-plume</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 2eee01c..5557c92 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>
@@ -44,6 +43,30 @@
<property name="dir">target/tomee</property>
<property name="appWorkingDir">target/workdir</property>
<property name="cleanOnStartUp">true</property>
+ </configuration>
+ </container>
+ <container qualifier="tomee-plume">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">plume</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>
+ <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">
tomee.mp.scan = all
</property>
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index a0e9ed2..6952368 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -172,7 +172,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 -->
@@ -185,7 +184,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>
@@ -202,4 +200,43 @@
</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>
+ <execution>
+ <id>tomee-plume</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <arquillian.launch>tomee-plume</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 9d77818..06e2bda 100644
--- a/tck/microprofile-tck/metrics/pom.xml
+++ b/tck/microprofile-tck/metrics/pom.xml
@@ -51,6 +51,44 @@
</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>
+ <execution>
+ <id>tomee-plume</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <arquillian.launch>tomee-plume</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 d585110..80dd3d1 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>
@@ -48,6 +47,36 @@
<property name="appWorkingDir">target/workdir</property>
<property name="cleanOnStartUp">true</property>
<property name="properties">
+ MP_METRICS_TAGS = tier=integration
+ </property>
+ </configuration>
+ </container>
+ <container qualifier="tomee-plume">
+ <configuration>
+ <property name="httpPort">50290</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">plume</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>
+ <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">
tomee.mp.scan = all
MP_METRICS_TAGS = tier=integration
</property>
diff --git a/tck/microprofile-tck/openapi/pom.xml b/tck/microprofile-tck/openapi/pom.xml
index 44861b0..0bd751f 100644
--- a/tck/microprofile-tck/openapi/pom.xml
+++ b/tck/microprofile-tck/openapi/pom.xml
@@ -56,6 +56,44 @@
</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>
+ <execution>
+ <id>tomee-plume</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <arquillian.launch>tomee-plume</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 33d3df5..fdac1ad 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>
@@ -49,6 +48,38 @@
<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-plume">
+ <configuration>
+ <property name="httpPort">50290</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">plume</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>
+ <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">
tomee.mp.scan = all
</property>
</configuration>
diff --git a/tck/microprofile-tck/opentracing/pom.xml b/tck/microprofile-tck/opentracing/pom.xml
index 73b3662..88f150a 100644
--- a/tck/microprofile-tck/opentracing/pom.xml
+++ b/tck/microprofile-tck/opentracing/pom.xml
@@ -43,6 +43,44 @@
</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>
+ <execution>
+ <id>tomee-plume</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <arquillian.launch>tomee-plume</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 d5b5a0f..e40091d 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>
@@ -43,6 +42,30 @@
<property name="dir">target/tomee</property>
<property name="appWorkingDir">target/workdir</property>
<property name="cleanOnStartUp">true</property>
+ </configuration>
+ </container>
+ <container qualifier="tomee-plume">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">plume</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>
+ <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">
tomee.mp.scan = all
</property>
diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml
index 54df529..51fa72c 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -73,6 +73,44 @@
</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>
+ <execution>
+ <id>tomee-plume</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <arquillian.launch>tomee-plume</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 f46dedf..b088d28 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>
@@ -50,6 +49,36 @@
<property name="additionalLibs">
mvn:com.github.tomakehurst:wiremock-standalone:2.10.1
</property>
+ </configuration>
+ </container>
+ <container qualifier="tomee-plume">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">plume</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>
+ <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>
<property name="properties">
tomee.mp.scan = all
</property>
diff --git a/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE b/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE
index 6cec2de..d1e0f9b 100644
--- a/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE
+++ b/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE
@@ -168,3 +168,26 @@ Joda.org (http://www.joda.org/).
This product includes software developed and copyrighted by the The OWASP
Foundation (https://www.owasp.org)
=========================================================================
+jose4j NOTICE
+
+jose4j
+Copyright 2012-2015 Brian Campbell
+
+EcdsaUsingShaAlgorithm contains code for converting the concatenated
+R & S values of the signature to and from DER, which was originally
+derived from the Apache Santuario XML Security library's SignatureECDSA
+implementation. http://santuario.apache.org/
+
+The Base64 implementation in this software was derived from the
+Apache Commons Codec project. http://commons.apache.org/proper/commons-codec/
+
+JSON processing in this software was derived from the JSON.simple toolkit.
+https://code.google.com/p/json-simple/
+=========================================================================
+Jackson JSON processor
+Jackson is a high-performance, Free/Open Source JSON processing library.
+It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
+been in development since 2007.
+It is currently developed by a community of developers, as well as supported
+commercially by FasterXML.com.
+=========================================================================
diff --git a/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE b/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE
index 58217b4..ae8ebf3 100644
--- a/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE
+++ b/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE
@@ -146,6 +146,28 @@ el-api - Unified Expression Language is dual licensed under 2 OSI approved licen
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL - Version 1.1)
GNU General Public License (GPL - Version 2, June 1991) with the Classpath Exception
=========================================================================
+Apache CXF NOTICE
+
+Java classes (source and binary) under org.apache.cxf.jaxws.javaee
+are generated from schema available here:
+(http://java.sun.com/xml/ns/javaee/javaee_5.xsd)
+
+Portions of the file cxf-utils.js derives from code marked:
+This code was written by Tyler Akins and has been placed in the
+public domain. It would be nice if you left this header intact.
+Base64 code from Tyler Akins -- http://rumkin.com
+
+The product contains code (StaxBuilder.java) that is
+ Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ See the NOTICE.jdom file for additional information
+
+This Product also includes software developed by David Heinemeier Hansson.
+(http://dev.rubyonrails.org/browser/trunk/activesupport/lib/active_support/inflections.rb)
+
+This product includes software Copyright University of Southampton IT Innovation Centre, 2009
+(http://www.it-innovation.soton.ac.uk).
+=========================================================================
ECJ - Eclipse Compiler for Java
Eclipse Public License - v 1.0 - https://www.eclipse.org/org/documents/epl-v10.html
=========================================================================
@@ -161,3 +183,26 @@ Joda.org (http://www.joda.org/).
This product includes software developed and copyrighted by the The OWASP
Foundation (https://www.owasp.org)
=========================================================================
+jose4j NOTICE
+
+jose4j
+Copyright 2012-2015 Brian Campbell
+
+EcdsaUsingShaAlgorithm contains code for converting the concatenated
+R & S values of the signature to and from DER, which was originally
+derived from the Apache Santuario XML Security library's SignatureECDSA
+implementation. http://santuario.apache.org/
+
+The Base64 implementation in this software was derived from the
+Apache Commons Codec project. http://commons.apache.org/proper/commons-codec/
+
+JSON processing in this software was derived from the JSON.simple toolkit.
+https://code.google.com/p/json-simple/
+=========================================================================
+Jackson JSON processor
+Jackson is a high-performance, Free/Open Source JSON processing library.
+It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
+been in development since 2007.
+It is currently developed by a community of developers, as well as supported
+commercially by FasterXML.com.
+=========================================================================
diff --git a/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE b/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE
index f5ea6ba..d1e0f9b 100644
--- a/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE
+++ b/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE
@@ -54,6 +54,22 @@ Copyright 2007-2010 Agimatec GmbH. All rights reserved.
=====================================
+Apache Tomcat NOTICE
+
+The original XML Schemas for Java EE Deployment Descriptors:
+ - javaee_5.xsd
+ - javaee_web_services_1_2.xsd
+ - javaee_web_services_client_1_2.xsd
+ - javaee_6.xsd
+ - javaee_web_services_1_3.xsd
+ - javaee_web_services_client_1_3.xsd
+ - web-app_3_0.xsd
+ - web-common_3_0.xsd
+ - web-fragment_3_0.xsd
+may be obtained from http://java.sun.com/xml/ns/javaee/
+
+
+=====================================
Apache MyFaces NOTICE
This software also includes code from Facelets (https://facelets.dev.java.net/)
@@ -76,6 +92,36 @@ javascript core, which is licensed under a modified BSD license or the Academic
This software also includes code from j4fry (http://www.j4fry.org/),
which is licensed under ASL 2.0.
+=====================================
+Apache ActiveMQ NOTICE
+
+This product includes software developed by the Protocol Buffers
+project (http://code.google.com/apis/protocolbuffers).
+
+
+=====================================
+Apache CXF NOTICE
+
+Java classes (source and binary) under org.apache.cxf.jaxws.javaee
+are generated from schema available here:
+(http://java.sun.com/xml/ns/javaee/javaee_5.xsd)
+
+Portions of the file cxf-utils.js derives from code marked:
+This code was written by Tyler Akins and has been placed in the
+public domain. It would be nice if you left this header intact.
+Base64 code from Tyler Akins -- http://rumkin.com
+
+The product contains code (StaxBuilder.java) that is
+ Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ See the NOTICE.jdom file for additional information
+
+This Product also includes software developed by David Heinemeier Hansson.
+(http://dev.rubyonrails.org/browser/trunk/activesupport/lib/active_support/inflections.rb)
+
+This product includes software Copyright University of Southampton IT Innovation Centre, 2009
+(http://www.it-innovation.soton.ac.uk).
+
=========================================================================
- JAnsi (http://http://jansi.fusesource.org/) org.fusesource.jansi:jansi:jar:1.8
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -104,12 +150,12 @@ EclipseLink - http://www.eclipse.org/eclipselink/
License: The EclipseLink project is dual licensed under the Eclipse Public License (http://www.eclipse.org/legal/epl-v10.html)
and the Eclipse Distribution Licensed (http://www.eclipse.org/org/documents/edl-v10.php).
=========================================================================
-ECJ - Eclipse Compiler for Java
-Eclipse Public License - v 1.0 - https://www.eclipse.org/org/documents/epl-v10.html
-=========================================================================
Mojarra JavaServer Faces - Oracle's open source implementation of the JSF standard (https://javaserverfaces.java.net/)
License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) plus GPL, https://glassfish.dev.java.net/public/CDDL+GPL.html
=========================================================================
+ECJ - Eclipse Compiler for Java
+Eclipse Public License - v 1.0 - https://www.eclipse.org/org/documents/epl-v10.html
+=========================================================================
Apache XBean :: ASM shaded (repackaged)
Copyright 2005-2013 The Apache Software Foundation
@@ -122,3 +168,26 @@ Joda.org (http://www.joda.org/).
This product includes software developed and copyrighted by the The OWASP
Foundation (https://www.owasp.org)
=========================================================================
+jose4j NOTICE
+
+jose4j
+Copyright 2012-2015 Brian Campbell
+
+EcdsaUsingShaAlgorithm contains code for converting the concatenated
+R & S values of the signature to and from DER, which was originally
+derived from the Apache Santuario XML Security library's SignatureECDSA
+implementation. http://santuario.apache.org/
+
+The Base64 implementation in this software was derived from the
+Apache Commons Codec project. http://commons.apache.org/proper/commons-codec/
+
+JSON processing in this software was derived from the JSON.simple toolkit.
+https://code.google.com/p/json-simple/
+=========================================================================
+Jackson JSON processor
+Jackson is a high-performance, Free/Open Source JSON processing library.
+It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
+been in development since 2007.
+It is currently developed by a community of developers, as well as supported
+commercially by FasterXML.com.
+=========================================================================
diff --git a/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE b/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE
index 9dde4bb..ae8ebf3 100644
--- a/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE
+++ b/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE
@@ -54,6 +54,22 @@ Copyright 2007-2010 Agimatec GmbH. All rights reserved.
=====================================
+Apache Tomcat NOTICE
+
+The original XML Schemas for Java EE Deployment Descriptors:
+ - javaee_5.xsd
+ - javaee_web_services_1_2.xsd
+ - javaee_web_services_client_1_2.xsd
+ - javaee_6.xsd
+ - javaee_web_services_1_3.xsd
+ - javaee_web_services_client_1_3.xsd
+ - web-app_3_0.xsd
+ - web-common_3_0.xsd
+ - web-fragment_3_0.xsd
+may be obtained from http://java.sun.com/xml/ns/javaee/
+
+
+=====================================
Apache MyFaces NOTICE
This software also includes code from Facelets (https://facelets.dev.java.net/)
@@ -76,6 +92,36 @@ javascript core, which is licensed under a modified BSD license or the Academic
This software also includes code from j4fry (http://www.j4fry.org/),
which is licensed under ASL 2.0.
+=====================================
+Apache ActiveMQ NOTICE
+
+This product includes software developed by the Protocol Buffers
+project (http://code.google.com/apis/protocolbuffers).
+
+
+=====================================
+Apache CXF NOTICE
+
+Java classes (source and binary) under org.apache.cxf.jaxws.javaee
+are generated from schema available here:
+(http://java.sun.com/xml/ns/javaee/javaee_5.xsd)
+
+Portions of the file cxf-utils.js derives from code marked:
+This code was written by Tyler Akins and has been placed in the
+public domain. It would be nice if you left this header intact.
+Base64 code from Tyler Akins -- http://rumkin.com
+
+The product contains code (StaxBuilder.java) that is
+ Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ See the NOTICE.jdom file for additional information
+
+This Product also includes software developed by David Heinemeier Hansson.
+(http://dev.rubyonrails.org/browser/trunk/activesupport/lib/active_support/inflections.rb)
+
+This product includes software Copyright University of Southampton IT Innovation Centre, 2009
+(http://www.it-innovation.soton.ac.uk).
+
=========================================================================
- JAnsi (http://http://jansi.fusesource.org/) org.fusesource.jansi:jansi:jar:1.8
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -100,6 +146,28 @@ el-api - Unified Expression Language is dual licensed under 2 OSI approved licen
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL - Version 1.1)
GNU General Public License (GPL - Version 2, June 1991) with the Classpath Exception
=========================================================================
+Apache CXF NOTICE
+
+Java classes (source and binary) under org.apache.cxf.jaxws.javaee
+are generated from schema available here:
+(http://java.sun.com/xml/ns/javaee/javaee_5.xsd)
+
+Portions of the file cxf-utils.js derives from code marked:
+This code was written by Tyler Akins and has been placed in the
+public domain. It would be nice if you left this header intact.
+Base64 code from Tyler Akins -- http://rumkin.com
+
+The product contains code (StaxBuilder.java) that is
+ Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ See the NOTICE.jdom file for additional information
+
+This Product also includes software developed by David Heinemeier Hansson.
+(http://dev.rubyonrails.org/browser/trunk/activesupport/lib/active_support/inflections.rb)
+
+This product includes software Copyright University of Southampton IT Innovation Centre, 2009
+(http://www.it-innovation.soton.ac.uk).
+=========================================================================
ECJ - Eclipse Compiler for Java
Eclipse Public License - v 1.0 - https://www.eclipse.org/org/documents/epl-v10.html
=========================================================================
@@ -115,3 +183,26 @@ Joda.org (http://www.joda.org/).
This product includes software developed and copyrighted by the The OWASP
Foundation (https://www.owasp.org)
=========================================================================
+jose4j NOTICE
+
+jose4j
+Copyright 2012-2015 Brian Campbell
+
+EcdsaUsingShaAlgorithm contains code for converting the concatenated
+R & S values of the signature to and from DER, which was originally
+derived from the Apache Santuario XML Security library's SignatureECDSA
+implementation. http://santuario.apache.org/
+
+The Base64 implementation in this software was derived from the
+Apache Commons Codec project. http://commons.apache.org/proper/commons-codec/
+
+JSON processing in this software was derived from the JSON.simple toolkit.
+https://code.google.com/p/json-simple/
+=========================================================================
+Jackson JSON processor
+Jackson is a high-performance, Free/Open Source JSON processing library.
+It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
+been in development since 2007.
+It is currently developed by a community of developers, as well as supported
+commercially by FasterXML.com.
+=========================================================================