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:00 UTC
[01/10] tomee git commit: TOMEE-2354 - Added MicroProfile Support to
TomEE Plus.
Repository: tomee
Updated Branches:
refs/heads/master 3e08bd720 -> a44544b6d
TOMEE-2354 - Added MicroProfile Support to TomEE Plus.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f3a49ae2
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f3a49ae2
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f3a49ae2
Branch: refs/heads/master
Commit: f3a49ae206dde246e3f89cd664fe07f794d5208a
Parents: 004ad51
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Tue Dec 11 12:44:57 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Dec 11 12:44:57 2018 +0000
----------------------------------------------------------------------
.../src/main/resources/META-INF/plus/NOTICE | 46 +++++++
tomee/tomee-plus-webapp/pom.xml | 134 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 92 +++++++++++++
3 files changed, 272 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f3a49ae2/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE
----------------------------------------------------------------------
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..7eb273a 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,27 @@ 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.
+=========================================================================
http://git-wip-us.apache.org/repos/asf/tomee/blob/f3a49ae2/tomee/tomee-plus-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 451657d..7081d6a 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -163,6 +163,140 @@
<scope>runtime</scope>
</dependency>
-->
+
+ <!-- MicroProfile -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mp-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.config</groupId>
+ <artifactId>microprofile-config-api</artifactId>
+ <version>${microprofile.config.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.config</groupId>
+ <artifactId>geronimo-config-impl</artifactId>
+ <version>${microprofile.config.impl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.jwt</groupId>
+ <artifactId>microprofile-jwt-auth-api</artifactId>
+ <version>${microprofile.jwt.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mp-jwt</artifactId>
+ <version>${microprofile.jwt.impl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>${microprofile.fault-tolerance.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.safeguard</groupId>
+ <artifactId>safeguard-impl</artifactId>
+ <version>${microprofile.fault-tolerance.impl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-api</artifactId>
+ <version>${microprofile.health.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo-health</artifactId>
+ <version>${microprofile.health.impl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ <version>${microprofile.metrics.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo-metrics</artifactId>
+ <version>${microprofile.metrics.impl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.rest.client</groupId>
+ <artifactId>microprofile-rest-client-api</artifactId>
+ <version>${microprofile.rest-client.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-mp-client</artifactId>
+ <version>${microprofile.rest-client.impl.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.json</groupId>
+ <artifactId>javax.json-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.openapi</groupId>
+ <artifactId>microprofile-openapi-api</artifactId>
+ <version>${microprofile.openapi.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo-openapi-impl</artifactId>
+ <version>${microprofile.openapi.impl.version}</version>
+ </dependency>
+
+ <!-- Jackson required by OpenAPI Impl -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>2.9.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.9.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
+ <version>${microprofile.opentracing.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo-opentracing</artifactId>
+ <version>${microprofile.opentracing.impl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-api</artifactId>
+ <version>0.31.0</version>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/f3a49ae2/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
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..7eb273a 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,27 @@ 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.
+=========================================================================
[03/10] tomee git commit: TOMEE-2354 - Moved TomEE Plus tests
execution to a separate build profile.
Posted by jl...@apache.org.
TOMEE-2354 - Moved TomEE Plus tests execution to a separate build profile.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9523e875
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9523e875
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9523e875
Branch: refs/heads/master
Commit: 9523e8755b0e8713e1466fa10b2b83e63e8201cc
Parents: 2c51e9c
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Tue Dec 11 16:52:20 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Dec 11 16:52:20 2018 +0000
----------------------------------------------------------------------
tck/microprofile-tck/config/pom.xml | 49 +++++++++++++++++++-------------
1 file changed, 30 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/9523e875/tck/microprofile-tck/config/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index 20bd025..d2fdd4c 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -35,6 +35,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <dependenciesToScan>
+ <dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency>
+ </dependenciesToScan>
<environmentVariables>
<my_int_property>45</my_int_property>
<MY_BOOLEAN_PROPERTY>true</MY_BOOLEAN_PROPERTY>
@@ -48,31 +51,39 @@
<goals>
<goal>test</goal>
</goals>
- <configuration>
- <dependenciesToScan>
- <dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency>
- </dependenciesToScan>
- </configuration>
- </execution>
- <execution>
- <id>tomee-plus</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <dependenciesToScan>
- <dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency>
- </dependenciesToScan>
- <systemPropertyVariables>
- <arquillian.launch>tomee-plus</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
</execution>
</executions>
</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>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
[10/10] tomee git commit: This closes apache/tomee#270
Posted by jl...@apache.org.
This closes apache/tomee#270
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a44544b6
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a44544b6
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a44544b6
Branch: refs/heads/master
Commit: a44544b6da1ee2ce34b585dc47debcd8c586ed28
Parents: 3e08bd7 3c0ee5d
Author: Jean-Louis Monteiro <je...@gmail.com>
Authored: Wed Dec 12 17:00:50 2018 +0100
Committer: Jean-Louis Monteiro <je...@gmail.com>
Committed: Wed Dec 12 17:00:50 2018 +0100
----------------------------------------------------------------------
pom.xml | 2 +
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 +++++-
.../jwt/src/test/resources/arquillian.xml | 61 ++++++---
tck/microprofile-tck/metrics/pom.xml | 38 ++++++
.../metrics/src/test/resources/arquillian.xml | 33 ++++-
tck/microprofile-tck/openapi/pom.xml | 39 +++++-
.../openapi/src/test/resources/arquillian.xml | 35 ++++-
tck/microprofile-tck/opentracing/pom.xml | 38 ++++++
.../src/test/resources/arquillian.xml | 27 +++-
tck/microprofile-tck/rest-client/pom.xml | 38 ++++++
.../src/test/resources/arquillian.xml | 33 ++++-
.../src/main/resources/META-INF/plume/NOTICE | 23 ++++
.../src/main/resources/META-INF/plus/NOTICE | 45 +++++++
.../tomee-microprofile-webapp/pom.xml | 6 +-
tomee/tomee-plume-webapp/pom.xml | 134 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 75 ++++++++++-
tomee/tomee-plus-webapp/pom.xml | 134 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 91 +++++++++++++
24 files changed, 1057 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
[04/10] tomee git commit: TOMEE-2354 - Simplified TomEE Plus tests
execution.
Posted by jl...@apache.org.
TOMEE-2354 - Simplified TomEE Plus tests execution.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/af409ec0
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/af409ec0
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/af409ec0
Branch: refs/heads/master
Commit: af409ec0e913f4f9e08b5c5a01c064a09543219b
Parents: 9523e87
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Tue Dec 11 17:15:27 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Dec 11 17:15:27 2018 +0000
----------------------------------------------------------------------
tck/microprofile-tck/config/pom.xml | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/af409ec0/tck/microprofile-tck/config/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index d2fdd4c..92d4161 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -45,14 +45,6 @@
<MY_STRING_PROPERTY>woohoo</MY_STRING_PROPERTY>
</environmentVariables>
</configuration>
- <executions>
- <execution>
- <id>tomee-microprofile</id>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
[05/10] tomee git commit: TOMEE-2354 - Update all MP TCK to execute
on TomEE Plus with a build profile.
Posted by jl...@apache.org.
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>
[02/10] tomee git commit: TOMEE-2354 - Added TomEE Plus container to
execute TCK with MicroProfile Config.
Posted by jl...@apache.org.
TOMEE-2354 - Added TomEE Plus container to execute TCK with MicroProfile Config.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2c51e9cd
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2c51e9cd
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2c51e9cd
Branch: refs/heads/master
Commit: 2c51e9cd4e5c1419e5d2f1f311c5d900eb58cbcb
Parents: f3a49ae
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Tue Dec 11 12:45:36 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Dec 11 12:45:36 2018 +0000
----------------------------------------------------------------------
tck/microprofile-tck/config/pom.xml | 30 ++++++++++++++++++--
.../config/src/test/resources/arquillian.xml | 18 +++++++++++-
2 files changed, 44 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/2c51e9cd/tck/microprofile-tck/config/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index aef424a..20bd025 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -35,9 +35,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <dependenciesToScan>
- <dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency>
- </dependenciesToScan>
<environmentVariables>
<my_int_property>45</my_int_property>
<MY_BOOLEAN_PROPERTY>true</MY_BOOLEAN_PROPERTY>
@@ -45,6 +42,33 @@
<MY_STRING_PROPERTY>woohoo</MY_STRING_PROPERTY>
</environmentVariables>
</configuration>
+ <executions>
+ <execution>
+ <id>tomee-microprofile</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <dependenciesToScan>
+ <dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency>
+ </dependenciesToScan>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tomee-plus</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <dependenciesToScan>
+ <dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency>
+ </dependenciesToScan>
+ <systemPropertyVariables>
+ <arquillian.launch>tomee-plus</arquillian.launch>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/2c51e9cd/tck/microprofile-tck/config/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/config/src/test/resources/arquillian.xml b/tck/microprofile-tck/config/src/test/resources/arquillian.xml
index ecddd0c..46e359c 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>
@@ -37,4 +37,20 @@
</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">
+ config.test = SUCCESS
+ org.apache.geronimo.config.configsource.SystemPropertyConfigSource.copy = false
+ </property>
+ </configuration>
+ </container>
</arquillian>
[07/10] tomee git commit: TOMEE-2354 - Fixed Plus NOTICE files.
Posted by jl...@apache.org.
TOMEE-2354 - Fixed Plus NOTICE files.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/79c96518
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/79c96518
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/79c96518
Branch: refs/heads/master
Commit: 79c965185ea5d1d35dd4b476ac6ca7ce224e2c05
Parents: d84524c
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Wed Dec 12 12:36:00 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Wed Dec 12 12:36:00 2018 +0000
----------------------------------------------------------------------
tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE | 1 -
tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE | 1 -
2 files changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/79c96518/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE
----------------------------------------------------------------------
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 7eb273a..ae8ebf3 100644
--- a/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE
+++ b/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE
@@ -183,7 +183,6 @@ 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
http://git-wip-us.apache.org/repos/asf/tomee/blob/79c96518/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
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 7eb273a..ae8ebf3 100644
--- a/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE
+++ b/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE
@@ -183,7 +183,6 @@ 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
[08/10] tomee git commit: TOMEE-2355 - Added MicroProfile Support to
TomEE Plume.
Posted by jl...@apache.org.
TOMEE-2355 - Added MicroProfile Support to TomEE Plume.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8968aa07
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8968aa07
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8968aa07
Branch: refs/heads/master
Commit: 8968aa071d5694a0eb13e62f3680248ee9c910d1
Parents: 79c9651
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Wed Dec 12 12:44:59 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Wed Dec 12 12:44:59 2018 +0000
----------------------------------------------------------------------
.../src/main/resources/META-INF/plume/NOTICE | 23 ++++
tomee/tomee-plume-webapp/pom.xml | 134 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 75 ++++++++++-
3 files changed, 229 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/8968aa07/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE
----------------------------------------------------------------------
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.
+=========================================================================
http://git-wip-us.apache.org/repos/asf/tomee/blob/8968aa07/tomee/tomee-plume-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index d1ad03d..e368e89 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -164,6 +164,140 @@
<scope>runtime</scope>
</dependency>
-->
+
+ <!-- MicroProfile -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mp-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.config</groupId>
+ <artifactId>microprofile-config-api</artifactId>
+ <version>${microprofile.config.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.config</groupId>
+ <artifactId>geronimo-config-impl</artifactId>
+ <version>${microprofile.config.impl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.jwt</groupId>
+ <artifactId>microprofile-jwt-auth-api</artifactId>
+ <version>${microprofile.jwt.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mp-jwt</artifactId>
+ <version>${microprofile.jwt.impl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>${microprofile.fault-tolerance.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.safeguard</groupId>
+ <artifactId>safeguard-impl</artifactId>
+ <version>${microprofile.fault-tolerance.impl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-api</artifactId>
+ <version>${microprofile.health.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo-health</artifactId>
+ <version>${microprofile.health.impl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ <version>${microprofile.metrics.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo-metrics</artifactId>
+ <version>${microprofile.metrics.impl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.rest.client</groupId>
+ <artifactId>microprofile-rest-client-api</artifactId>
+ <version>${microprofile.rest-client.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-mp-client</artifactId>
+ <version>${microprofile.rest-client.impl.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.json</groupId>
+ <artifactId>javax.json-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.openapi</groupId>
+ <artifactId>microprofile-openapi-api</artifactId>
+ <version>${microprofile.openapi.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo-openapi-impl</artifactId>
+ <version>${microprofile.openapi.impl.version}</version>
+ </dependency>
+
+ <!-- Jackson required by OpenAPI Impl -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
+ <version>${microprofile.opentracing.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo-opentracing</artifactId>
+ <version>${microprofile.opentracing.impl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-api</artifactId>
+ <version>${opentracing.api}</version>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/8968aa07/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
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.
+=========================================================================
[09/10] tomee git commit: TOMEE-2355 - Update all MP TCK to execute
on TomEE Plume with a build profile.
Posted by jl...@apache.org.
TOMEE-2355 - Update all MP TCK to execute on TomEE Plume 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/3c0ee5df
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3c0ee5df
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3c0ee5df
Branch: refs/heads/master
Commit: 3c0ee5df691e718c8c68fca1529b2caa963a75ad
Parents: 8968aa0
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Wed Dec 12 14:15:27 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Wed Dec 12 14:15:27 2018 +0000
----------------------------------------------------------------------
tck/microprofile-tck/config/pom.xml | 11 +++++++++++
.../config/src/test/resources/arquillian.xml | 16 ++++++++++++++++
tck/microprofile-tck/fault-tolerance/pom.xml | 11 +++++++++++
.../src/test/resources/arquillian.xml | 12 ++++++++++++
tck/microprofile-tck/health/pom.xml | 11 +++++++++++
.../health/src/test/resources/arquillian.xml | 12 ++++++++++++
tck/microprofile-tck/jwt/pom.xml | 11 +++++++++++
.../jwt/src/test/resources/arquillian.xml | 15 +++++++++++++++
tck/microprofile-tck/metrics/pom.xml | 11 +++++++++++
.../metrics/src/test/resources/arquillian.xml | 15 +++++++++++++++
tck/microprofile-tck/openapi/pom.xml | 11 +++++++++++
.../openapi/src/test/resources/arquillian.xml | 16 ++++++++++++++++
tck/microprofile-tck/opentracing/pom.xml | 11 +++++++++++
.../opentracing/src/test/resources/arquillian.xml | 12 ++++++++++++
tck/microprofile-tck/rest-client/pom.xml | 11 +++++++++++
.../rest-client/src/test/resources/arquillian.xml | 15 +++++++++++++++
16 files changed, 201 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/tck/microprofile-tck/config/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index 92d4161..a5cce5a 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -69,6 +69,17 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/tck/microprofile-tck/config/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/config/src/test/resources/arquillian.xml b/tck/microprofile-tck/config/src/test/resources/arquillian.xml
index 46e359c..bace620 100644
--- a/tck/microprofile-tck/config/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/config/src/test/resources/arquillian.xml
@@ -53,4 +53,20 @@
</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>
</arquillian>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/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 43a82c0..81060d1 100644
--- a/tck/microprofile-tck/fault-tolerance/pom.xml
+++ b/tck/microprofile-tck/fault-tolerance/pom.xml
@@ -64,6 +64,17 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/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 a23fae3..ec912c5 100644
--- a/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
@@ -45,4 +45,16 @@
<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>
</arquillian>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/tck/microprofile-tck/health/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/health/pom.xml b/tck/microprofile-tck/health/pom.xml
index 9159c3e..06c5dd0 100644
--- a/tck/microprofile-tck/health/pom.xml
+++ b/tck/microprofile-tck/health/pom.xml
@@ -64,6 +64,17 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/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 a23fae3..ec912c5 100644
--- a/tck/microprofile-tck/health/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/health/src/test/resources/arquillian.xml
@@ -45,4 +45,16 @@
<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>
</arquillian>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/tck/microprofile-tck/jwt/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index 6c71438..ccc97fd 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -194,6 +194,17 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/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 53f569c..4929cb5 100644
--- a/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml
@@ -51,4 +51,19 @@
</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">
+ org.apache.webbeans.component.PrincipalBean.proxy=false
+ </property>
+ </configuration>
+ </container>
</arquillian>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/tck/microprofile-tck/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/metrics/pom.xml b/tck/microprofile-tck/metrics/pom.xml
index e339279..e013103 100644
--- a/tck/microprofile-tck/metrics/pom.xml
+++ b/tck/microprofile-tck/metrics/pom.xml
@@ -72,6 +72,17 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/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 79e9905..f8ec681 100644
--- a/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml
@@ -51,4 +51,19 @@
</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>
</arquillian>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/tck/microprofile-tck/openapi/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/openapi/pom.xml b/tck/microprofile-tck/openapi/pom.xml
index 6b7fcd8..66c2375 100644
--- a/tck/microprofile-tck/openapi/pom.xml
+++ b/tck/microprofile-tck/openapi/pom.xml
@@ -76,6 +76,17 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/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 4b9d334..e42da07 100644
--- a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
@@ -53,4 +53,20 @@
</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>
</arquillian>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/tck/microprofile-tck/opentracing/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/opentracing/pom.xml b/tck/microprofile-tck/opentracing/pom.xml
index 99a4e6d..65924e0 100644
--- a/tck/microprofile-tck/opentracing/pom.xml
+++ b/tck/microprofile-tck/opentracing/pom.xml
@@ -64,6 +64,17 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/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 401b6bb..aa4f421 100644
--- a/tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml
@@ -44,4 +44,16 @@
<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>
</arquillian>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/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 f94276a..0312e53 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -90,6 +90,17 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3c0ee5df/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 1534c1c..731c9c2 100644
--- a/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
@@ -51,4 +51,19 @@
</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>
</arquillian>
[06/10] tomee git commit: TOMEE-2354 - Moved MP dependencies versions
to parent pom.
Posted by jl...@apache.org.
TOMEE-2354 - Moved MP dependencies versions to parent pom.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d84524c7
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d84524c7
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d84524c7
Branch: refs/heads/master
Commit: d84524c7b843faf04ff928a4267702829c5942a7
Parents: 3948d2b
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Wed Dec 12 12:31:20 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Wed Dec 12 12:31:20 2018 +0000
----------------------------------------------------------------------
pom.xml | 2 ++
tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml | 6 +++---
tomee/tomee-plus-webapp/pom.xml | 6 +++---
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d84524c7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bce74b0..770f3af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,6 +216,8 @@
<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>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/d84524c7/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
index 85fc803..2852772 100644
--- a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
@@ -146,13 +146,13 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.9.4</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.4</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
@@ -176,7 +176,7 @@
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
- <version>0.31.0</version>
+ <version>${opentracing.api}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/d84524c7/tomee/tomee-plus-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 7081d6a..6aebbef 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -265,13 +265,13 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.9.4</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.4</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
@@ -295,7 +295,7 @@
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
- <version>0.31.0</version>
+ <version>${opentracing.api}</version>
</dependency>
</dependencies>