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:06:59 UTC
[tomee] branch tomee8-java11 created (now e378d75)
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a change to branch tomee8-java11
in repository https://gitbox.apache.org/repos/asf/tomee.git.
at e378d75 more fixes in the build for Java 11
This branch includes the following new commits:
new d7e8e95 Adding new modules to the build as they have been removed from the JDK
new 267f798 Revert "TOMEE-2355 - Update all MP TCK to execute on TomEE Plume with a build profile."
new 69401ef Revert "TOMEE-2355 - Added MicroProfile Support to TomEE Plume."
new e67a23d Revert "TOMEE-2354 - Fixed Plus NOTICE files."
new f9296eb Revert "TOMEE-2354 - Moved MP dependencies versions to parent pom."
new e476eae Revert "TOMEE-2354 - Update all MP TCK to execute on TomEE Plus with a build profile."
new 3dd0c31 Revert "TOMEE-2354 - Simplified TomEE Plus tests execution."
new 0c73792 Revert "TOMEE-2354 - Moved TomEE Plus tests execution to a separate build profile."
new ecaedc4 Revert "TOMEE-2354 - Added TomEE Plus container to execute TCK with MicroProfile Config."
new b0d253a Revert "TOMEE-2354 - Added MicroProfile Support to TomEE Plus."
new e5cb303 Update EclipseLink to 2.7.3
new 8377824 Attempt to use the old MessageFactory as opposed to the default in javaee-api which points to Axis 2
new 6f08136 Try adding the --add-opens from the catalina.sh script when running on Java 9+
new 381af0b Add Activation implementation
new 4e6be9d Trying different message factory
new a1921d5 WIP experimentation
new ff62659 WIP modules
new df272b2 WIP - modules
new 187a297 Fix plugin dependencies
new dda9ed1 Fix test
new b0be76b These settings are no longer required
new 1c99e7c Sync up with master
new f54573e Stashing this change
new 5fcf23e fixes cxf dependency
new 33bc6f5 Cleanup dependencies
new 3b68765 Adding exclude back and removing com.sun.xml.ws
new 0c210dd Further cleanup
new 91c7427 Remove unused import
new 89e0544 Update mockito and fix java.lang.NoClassDefFoundError for jaxb
new 9faa205 Fixing dependencies
new e378d75 more fixes in the build for Java 11
The 31 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[tomee] 05/31: Revert "TOMEE-2354 - Moved MP dependencies versions
to parent pom."
Posted by jl...@apache.org.
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 f9296ebca8377721e3b358886e9594ae613847f7
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Dec 19 01:22:11 2018 +0000
Revert "TOMEE-2354 - Moved MP dependencies versions to parent pom."
This reverts commit d84524c7b843faf04ff928a4267702829c5942a7.
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5c61c59..48d90f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,6 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/tomee.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/tomee.git</developerConnection>
<url>http://git-wip-us.apache.org/repos/asf/tomee.git</url>
- <tag>HEAD</tag>
</scm>
<properties>
[tomee] 30/31: Fixing dependencies
Posted by jl...@apache.org.
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 9faa205accefa242d31af7c462362bc485a112f8
Author: Daniel Cunha (soro) <da...@apache.org>
AuthorDate: Sat Mar 2 09:30:25 2019 -0300
Fixing dependencies
---
pom.xml | 4 ++--
utils/openejb-mockito/pom.xml | 8 --------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 25e3b63..a68d2d2 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/utils/openejb-mockito/pom.xml b/utils/openejb-mockito/pom.xml
index 1ec0aec..9e7c7dc 100644
--- a/utils/openejb-mockito/pom.xml
+++ b/utils/openejb-mockito/pom.xml
@@ -47,13 +47,5 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- </dependency>
</dependencies>
</project>
[tomee] 08/31: Revert "TOMEE-2354 - Moved TomEE Plus tests
execution to a separate build profile."
Posted by jl...@apache.org.
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 0c7379218c937732615f7cdd2cab7177f40186b4
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Dec 19 01:22:40 2018 +0000
Revert "TOMEE-2354 - Moved TomEE Plus tests execution to a separate build profile."
This reverts commit 9523e8755b0e8713e1466fa10b2b83e63e8201cc.
---
tck/microprofile-tck/config/pom.xml | 49 ++++++++++++++-----------------------
1 file changed, 19 insertions(+), 30 deletions(-)
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index 68f314c..7888f3b 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -34,9 +34,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>
@@ -50,39 +47,31 @@
<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>
[tomee] 02/31: Revert "TOMEE-2355 - Update all MP TCK to execute on
TomEE Plume with a build profile."
Posted by jl...@apache.org.
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 267f79838d68d49e4a2ae07d22c116dd906a6755
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Dec 19 01:21:04 2018 +0000
Revert "TOMEE-2355 - Update all MP TCK to execute on TomEE Plume with a build profile."
This reverts commit 3c0ee5df691e718c8c68fca1529b2caa963a75ad.
---
tck/microprofile-tck/config/pom.xml | 11 -----------
tck/microprofile-tck/fault-tolerance/pom.xml | 11 -----------
tck/microprofile-tck/health/pom.xml | 11 -----------
tck/microprofile-tck/jwt/pom.xml | 11 -----------
tck/microprofile-tck/metrics/pom.xml | 11 -----------
tck/microprofile-tck/openapi/pom.xml | 11 -----------
tck/microprofile-tck/opentracing/pom.xml | 11 -----------
tck/microprofile-tck/rest-client/pom.xml | 11 -----------
8 files changed, 88 deletions(-)
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index 4f5a270..993477e 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -68,17 +68,6 @@
</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>
diff --git a/tck/microprofile-tck/fault-tolerance/pom.xml b/tck/microprofile-tck/fault-tolerance/pom.xml
index e8ba927..4fc0ad4 100644
--- a/tck/microprofile-tck/fault-tolerance/pom.xml
+++ b/tck/microprofile-tck/fault-tolerance/pom.xml
@@ -64,17 +64,6 @@
</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>
diff --git a/tck/microprofile-tck/health/pom.xml b/tck/microprofile-tck/health/pom.xml
index 084b693..62dee30 100644
--- a/tck/microprofile-tck/health/pom.xml
+++ b/tck/microprofile-tck/health/pom.xml
@@ -63,17 +63,6 @@
</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>
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index 6952368..eb6dd19 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -221,17 +221,6 @@
</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>
diff --git a/tck/microprofile-tck/metrics/pom.xml b/tck/microprofile-tck/metrics/pom.xml
index 06e2bda..c5fc0c3 100644
--- a/tck/microprofile-tck/metrics/pom.xml
+++ b/tck/microprofile-tck/metrics/pom.xml
@@ -71,17 +71,6 @@
</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>
diff --git a/tck/microprofile-tck/openapi/pom.xml b/tck/microprofile-tck/openapi/pom.xml
index ed73b31..5b6279d 100644
--- a/tck/microprofile-tck/openapi/pom.xml
+++ b/tck/microprofile-tck/openapi/pom.xml
@@ -75,17 +75,6 @@
</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>
diff --git a/tck/microprofile-tck/opentracing/pom.xml b/tck/microprofile-tck/opentracing/pom.xml
index 88f150a..09ca8a9 100644
--- a/tck/microprofile-tck/opentracing/pom.xml
+++ b/tck/microprofile-tck/opentracing/pom.xml
@@ -63,17 +63,6 @@
</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>
diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml
index 51fa72c..2f7aa01 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -93,17 +93,6 @@
</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>
[tomee] 17/31: WIP modules
Posted by jl...@apache.org.
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 ff62659d6a239d07975d5015465eb3e337305d20
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Sun Jan 6 00:21:06 2019 +0000
WIP modules
---
container/openejb-core/pom.xml | 1 +
container/openejb-jee-accessors/pom.xml | 10 ++++++++++
2 files changed, 11 insertions(+)
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 840f724..7c3ca32 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -445,6 +445,7 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
diff --git a/container/openejb-jee-accessors/pom.xml b/container/openejb-jee-accessors/pom.xml
index 883cafa..1fc5961 100644
--- a/container/openejb-jee-accessors/pom.xml
+++ b/container/openejb-jee-accessors/pom.xml
@@ -56,6 +56,16 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<scope>test</scope>
[tomee] 10/31: Revert "TOMEE-2354 - Added MicroProfile Support to
TomEE Plus."
Posted by jl...@apache.org.
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 b0d253ab53c15b966717ece551125d85156c5122
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Dec 19 01:22:56 2018 +0000
Revert "TOMEE-2354 - Added MicroProfile Support to TomEE Plus."
This reverts commit f3a49ae206dde246e3f89cd664fe07f794d5208a.
---
.../src/main/resources/META-INF/plus/NOTICE | 46 -----------
.../src/main/resources/META-INF/NOTICE | 92 ----------------------
2 files changed, 138 deletions(-)
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..58217b4 100644
--- a/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE
+++ b/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE
@@ -146,28 +146,6 @@ 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
=========================================================================
@@ -183,27 +161,3 @@ 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 7eb273a..9dde4bb 100644
--- a/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE
+++ b/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE
@@ -54,22 +54,6 @@ 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/)
@@ -92,36 +76,6 @@ 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)
@@ -146,28 +100,6 @@ 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
=========================================================================
@@ -183,27 +115,3 @@ 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.
-=========================================================================
[tomee] 12/31: Attempt to use the old MessageFactory as opposed to
the default in javaee-api which points to Axis 2
Posted by jl...@apache.org.
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 83778242b61b071bf9715164b3631be47df6b4fe
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Fri Dec 21 11:12:55 2018 +0000
Attempt to use the old MessageFactory as opposed to the default in javaee-api which points to Axis 2
---
.../arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
index bac5665..49b6166 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
@@ -29,6 +29,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.
+ org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.MessageFactoryImpl
</property>
</configuration>
</container>
@@ -43,6 +44,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests
+ org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.MessageFactoryImpl
</property>
</configuration>
</container>
@@ -72,6 +74,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.
+ org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.MessageFactoryImpl
</property>
</configuration>
</container>
[tomee] 28/31: Remove unused import
Posted by jl...@apache.org.
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 91c74270169669deb59a2c208d574fd214010108
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Fri Mar 1 20:16:15 2019 +0000
Remove unused import
---
.../src/main/java/org/apache/openejb/config/RemoteServer.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
index 62abf59..d0f210a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
@@ -17,7 +17,6 @@
package org.apache.openejb.config;
-import org.apache.commons.lang3.JavaVersion;
import org.apache.openejb.OpenEJBRuntimeException;
import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.Options;
[tomee] 24/31: fixes cxf dependency
Posted by jl...@apache.org.
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 5fcf23e6b6b27cae94bc9d246044b0cde40daea8
Author: Otavio Santana <ot...@gmail.com>
AuthorDate: Fri Mar 1 09:46:04 2019 -0300
fixes cxf dependency
---
server/openejb-cxf/pom.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index cad9533..cb66c32 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -215,6 +215,20 @@
<version>1.4.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.1</version>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>rt</artifactId>
+ <version>2.3.1</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<profiles>
[tomee] 19/31: Fix plugin dependencies
Posted by jl...@apache.org.
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 187a297f06d532fd0f404c3501a61ac9fb3dcb5e
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Sun Jan 6 21:37:54 2019 +0000
Fix plugin dependencies
---
tomee/apache-tomee/pom.xml | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index b5b7d63..37f4bab 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -159,7 +159,7 @@
</archive>
</configuration>
</plugin>
- <!--<plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
@@ -170,21 +170,19 @@
</goals>
</execution>
</executions>
- <configuration>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>2.4.0-b180830.0438</version>
- </dependency>
- </dependencies>
- </configuration>
- </plugin>-->
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ </dependencies>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
[tomee] 14/31: Add Activation implementation
Posted by jl...@apache.org.
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 381af0b2cd41232d2216731f35aa7e1871ec336d
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Fri Jan 4 15:18:00 2019 +0000
Add Activation implementation
---
container/openejb-core/pom.xml | 4 ++++
pom.xml | 5 +++++
2 files changed, 9 insertions(+)
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index df5d188..9234fb8 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -439,6 +439,10 @@
<artifactId>javax.activation-api</artifactId>
</dependency>
<dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jacorb</groupId>
<artifactId>jacorb</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
index ddde54b..d8adac8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -910,6 +910,11 @@
<version>1.2.0</version>
</dependency>
<dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
<groupId>org.jacorb</groupId>
<artifactId>jacorb</artifactId>
<version>3.9</version>
[tomee] 25/31: Cleanup dependencies
Posted by jl...@apache.org.
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 33bc6f55599cfa4de181bd0e937625dbca78b5a5
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Fri Mar 1 15:48:15 2019 +0000
Cleanup dependencies
---
arquillian/ziplock/pom.xml | 4 ++--
container/openejb-jee-accessors/pom.xml | 16 ++++++++++++++++
examples/java-modules/pom.xml | 5 +++++
examples/moviefun-rest/pom.xml | 12 ++++++++++++
examples/mp-rest-client/pom.xml | 12 ++++++++++++
examples/mp-rest-jwt/pom.xml | 12 ++++++++++++
examples/polling-parent/polling-domain/pom.xml | 8 ++++++++
examples/polling-parent/pom.xml | 8 ++++----
examples/rest-cdi/pom.xml | 12 ++++++++++++
examples/rest-example/pom.xml | 8 ++++----
examples/rest-on-ejb/pom.xml | 8 ++++----
examples/tomee-jersey-eclipselink/pom.xml | 12 ++++++++++++
examples/webservice-inheritance/pom.xml | 8 ++++----
pom.xml | 10 ++++++++++
server/openejb-client/pom.xml | 8 ++++++++
tck/bval-tomee/pom.xml | 8 ++++----
tomee/apache-tomee/pom.xml | 8 ++++----
17 files changed, 133 insertions(+), 26 deletions(-)
diff --git a/arquillian/ziplock/pom.xml b/arquillian/ziplock/pom.xml
index 843f09f..ae0c763 100644
--- a/arquillian/ziplock/pom.xml
+++ b/arquillian/ziplock/pom.xml
@@ -56,8 +56,8 @@
<version>${version.javaee-api}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
diff --git a/container/openejb-jee-accessors/pom.xml b/container/openejb-jee-accessors/pom.xml
index 1fc5961..3ad6cba 100644
--- a/container/openejb-jee-accessors/pom.xml
+++ b/container/openejb-jee-accessors/pom.xml
@@ -66,6 +66,22 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion> <!-- Is already included in java-ee-api -->
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<scope>test</scope>
diff --git a/examples/java-modules/pom.xml b/examples/java-modules/pom.xml
index 5b64f04..a5eb993 100644
--- a/examples/java-modules/pom.xml
+++ b/examples/java-modules/pom.xml
@@ -57,6 +57,11 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
</plugins>
</build>
<dependencies>
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index 134aedc..3f3bd36 100644
--- a/examples/moviefun-rest/pom.xml
+++ b/examples/moviefun-rest/pom.xml
@@ -189,6 +189,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
diff --git a/examples/mp-rest-client/pom.xml b/examples/mp-rest-client/pom.xml
index 48c30d4..49c7b45 100755
--- a/examples/mp-rest-client/pom.xml
+++ b/examples/mp-rest-client/pom.xml
@@ -52,6 +52,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
diff --git a/examples/mp-rest-jwt/pom.xml b/examples/mp-rest-jwt/pom.xml
index fc17871..9bbe73e 100644
--- a/examples/mp-rest-jwt/pom.xml
+++ b/examples/mp-rest-jwt/pom.xml
@@ -123,6 +123,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>4.23</version>
diff --git a/examples/polling-parent/polling-domain/pom.xml b/examples/polling-parent/polling-domain/pom.xml
index c40864e..a989662 100644
--- a/examples/polling-parent/polling-domain/pom.xml
+++ b/examples/polling-parent/polling-domain/pom.xml
@@ -40,6 +40,14 @@
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/examples/polling-parent/pom.xml b/examples/polling-parent/pom.xml
index 6bc7918..b2a926a 100644
--- a/examples/polling-parent/pom.xml
+++ b/examples/polling-parent/pom.xml
@@ -106,15 +106,15 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>2.4.0-b180830.0438</version>
+ <version>2.3.2</version>
<scope>provided</scope>
</dependency>
diff --git a/examples/rest-cdi/pom.xml b/examples/rest-cdi/pom.xml
index 2da7da1..91ad785 100644
--- a/examples/rest-cdi/pom.xml
+++ b/examples/rest-cdi/pom.xml
@@ -72,6 +72,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml
index 99f19f3..1c1a5e5 100644
--- a/examples/rest-example/pom.xml
+++ b/examples/rest-example/pom.xml
@@ -122,15 +122,15 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>2.4.0-b180830.0438</version>
+ <version>2.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/examples/rest-on-ejb/pom.xml b/examples/rest-on-ejb/pom.xml
index b66558c..814bcad 100644
--- a/examples/rest-on-ejb/pom.xml
+++ b/examples/rest-on-ejb/pom.xml
@@ -72,15 +72,15 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>2.4.0-b180830.0438</version>
+ <version>2.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/examples/tomee-jersey-eclipselink/pom.xml b/examples/tomee-jersey-eclipselink/pom.xml
index 7e98bfc..a4c52df 100644
--- a/examples/tomee-jersey-eclipselink/pom.xml
+++ b/examples/tomee-jersey-eclipselink/pom.xml
@@ -40,6 +40,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
diff --git a/examples/webservice-inheritance/pom.xml b/examples/webservice-inheritance/pom.xml
index 04d4336..89153f5 100644
--- a/examples/webservice-inheritance/pom.xml
+++ b/examples/webservice-inheritance/pom.xml
@@ -57,15 +57,15 @@
<version>8.0</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>2.4.0-b180830.0438</version>
+ <version>2.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 9620136..25e3b63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -895,6 +895,16 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb</artifactId>
+ <version>3.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ <version>1.0.6.Final</version>
+ </dependency>
+ <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
diff --git a/server/openejb-client/pom.xml b/server/openejb-client/pom.xml
index 2101c35..3bb6e36 100644
--- a/server/openejb-client/pom.xml
+++ b/server/openejb-client/pom.xml
@@ -162,6 +162,14 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
<scope>test</scope>
diff --git a/tck/bval-tomee/pom.xml b/tck/bval-tomee/pom.xml
index d166886..4f4093a 100644
--- a/tck/bval-tomee/pom.xml
+++ b/tck/bval-tomee/pom.xml
@@ -175,14 +175,14 @@
</configuration>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>2.4.0-b180830.0438</version>
+ <version>2.3.2</version>
</dependency>
</dependencies>
</plugin>
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index 37f4bab..4dd6bb2 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -172,14 +172,14 @@
</executions>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>2.4.0-b180830.0438</version>
+ <version>2.3.2</version>
</dependency>
</dependencies>
</plugin>
[tomee] 21/31: These settings are no longer required
Posted by jl...@apache.org.
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 b0be76b93a74220d3e7db8d6ebed3fba6b5ed848
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Mon Jan 7 17:18:50 2019 +0000
These settings are no longer required
---
.../arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
index b664fa2..bac5665 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
@@ -29,7 +29,6 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.
- #org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.ver1_2.SOAPMessageFactory1_2Impl
</property>
</configuration>
</container>
@@ -44,7 +43,6 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests
- #org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.ver1_2.SOAPMessageFactory1_2Impl
</property>
</configuration>
</container>
@@ -74,7 +72,6 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.
- #org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.ver1_2.SOAPMessageFactory1_2Impl
</property>
</configuration>
</container>
[tomee] 15/31: Trying different message factory
Posted by jl...@apache.org.
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 4e6be9dfa72b91265645ae142115f192a871a83c
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Fri Jan 4 16:45:53 2019 +0000
Trying different message factory
---
.../arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
index 49b6166..0f68384 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
@@ -29,7 +29,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.
- org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.MessageFactoryImpl
+ org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.ver1_2.SOAPMessageFactory1_2Impl
</property>
</configuration>
</container>
@@ -44,7 +44,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests
- org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.MessageFactoryImpl
+ org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.ver1_2.SOAPMessageFactory1_2Impl
</property>
</configuration>
</container>
@@ -74,7 +74,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.
- org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.MessageFactoryImpl
+ org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.ver1_2.SOAPMessageFactory1_2Impl
</property>
</configuration>
</container>
[tomee] 11/31: Update EclipseLink to 2.7.3
Posted by jl...@apache.org.
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 e5cb3032063379fafc15da03fa627f83acf1142b
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Dec 19 12:45:09 2018 +0000
Update EclipseLink to 2.7.3
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 48d90f5..ddde54b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,7 +188,7 @@
<version.axiom>1.2.20</version.axiom>
<version.xalan>2.7.2</version.xalan>
<version.hibernate>4.2.18.Final</version.hibernate>
- <version.eclipselink>2.6.4</version.eclipselink>
+ <version.eclipselink>2.7.3</version.eclipselink>
<version.groovy>2.4.12</version.groovy>
<!-- arquillian related -->
[tomee] 09/31: Revert "TOMEE-2354 - Added TomEE Plus container to
execute TCK with MicroProfile Config."
Posted by jl...@apache.org.
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 ecaedc4d2e5e5637dd157786ae7f7bdb0187c47b
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Dec 19 01:22:48 2018 +0000
Revert "TOMEE-2354 - Added TomEE Plus container to execute TCK with MicroProfile Config."
This reverts commit 2c51e9cd4e5c1419e5d2f1f311c5d900eb58cbcb.
---
tck/microprofile-tck/config/pom.xml | 30 +++-------------------
.../config/src/test/resources/arquillian.xml | 2 +-
2 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index 7888f3b..4cb8e45 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -34,6 +34,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>
@@ -41,33 +44,6 @@
<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>
diff --git a/tck/microprofile-tck/config/src/test/resources/arquillian.xml b/tck/microprofile-tck/config/src/test/resources/arquillian.xml
index 5451a0c..f40d75f 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-microprofile" default="true">
+ <container qualifier="tomee-remote" default="true">
<configuration>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
[tomee] 31/31: more fixes in the build for Java 11
Posted by jl...@apache.org.
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 e378d752074ac3075d91e813fca53bba1edc28e7
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Fri Jul 19 16:41:42 2019 +0200
more fixes in the build for Java 11
---
examples/applicationcomposer-jaxws-cdi/pom.xml | 42 ++++++++++-
examples/change-jaxws-url/pom.xml | 39 ++++++++++
examples/jaxrs-json-provider-jettison/pom.xml | 20 +++++
.../src/test/resources/arquillian.xml | 1 +
examples/moviefun-rest/pom.xml | 2 -
examples/mp-metrics-metered/pom.xml | 9 +++
examples/mp-rest-jwt/pom.xml | 12 ---
.../mp-rest-jwt/src/test/resources/arquillian.xml | 1 +
examples/polling-parent/polling-domain/pom.xml | 4 -
examples/polling-parent/pom.xml | 6 ++
examples/simple-webservice/pom.xml | 39 ++++++++++
examples/webservice-attachments/pom.xml | 39 ++++++++++
examples/webservice-handlerchain/pom.xml | 39 ++++++++++
examples/webservice-holder/pom.xml | 39 ++++++++++
examples/webservice-inheritance/pom.xml | 39 ++++++++++
examples/webservice-security/pom.xml | 39 ++++++++++
examples/webservice-ssl-client-cert/pom.xml | 39 ++++++++++
examples/webservice-ws-security/pom.xml | 37 ++++++++++
.../webservice-ws-with-resources-config/pom.xml | 39 ++++++++++
.../apache/tomee/microprofile/jwt/MPJWTFilter.java | 2 +-
pom.xml | 85 ++++++++++++++++++----
server/openejb-cxf/pom.xml | 36 +++++++++
.../server/webservices/saaj/SaajUniverseTest.java | 2 +-
23 files changed, 574 insertions(+), 36 deletions(-)
diff --git a/examples/applicationcomposer-jaxws-cdi/pom.xml b/examples/applicationcomposer-jaxws-cdi/pom.xml
index d5b86f9..e4cdbd8 100644
--- a/examples/applicationcomposer-jaxws-cdi/pom.xml
+++ b/examples/applicationcomposer-jaxws-cdi/pom.xml
@@ -17,7 +17,8 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.superbiz</groupId>
@@ -79,6 +80,45 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>active-on-jdk-11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <dependencies>
+ <!--
+ Java EE API replacements for JDK 11
+ -->
+ <!-- JAXB for Java 11 -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ <!-- CXF does not support 4.1 that comes with Sun WS implementation -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <!--<version>4.1</version>-->
+ <version>3.1.4</version>
+ </dependency>
+ <!-- JAXWS for Java 11 -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>rt</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<!-- This section allows you to configure where to publish libraries for
sharing. It is not required and may be deleted. For more information see:
http://maven.apache.org/plugins/maven-deploy-plugin/ -->
diff --git a/examples/change-jaxws-url/pom.xml b/examples/change-jaxws-url/pom.xml
index 0538cd8..d90175e 100644
--- a/examples/change-jaxws-url/pom.xml
+++ b/examples/change-jaxws-url/pom.xml
@@ -127,6 +127,45 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>active-on-jdk-11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <dependencies>
+ <!--
+ Java EE API replacements for JDK 11
+ -->
+ <!-- JAXB for Java 11 -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ <!-- CXF does not support 4.1 that comes with Sun WS implementation -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <!--<version>4.1</version>-->
+ <version>3.1.4</version>
+ </dependency>
+ <!-- JAXWS for Java 11 -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>rt</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
<!--
This section allows you to configure where to publish libraries for sharing.
It is not required and may be deleted. For more information see:
diff --git a/examples/jaxrs-json-provider-jettison/pom.xml b/examples/jaxrs-json-provider-jettison/pom.xml
index 4703017..27b04c2 100755
--- a/examples/jaxrs-json-provider-jettison/pom.xml
+++ b/examples/jaxrs-json-provider-jettison/pom.xml
@@ -112,4 +112,24 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>active-on-jdk-11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <dependencies>
+ <!--
+ Java EE API replacements for JDK 11
+ -->
+ <!-- JAXB for Java 11 -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/jaxrs-json-provider-jettison/src/test/resources/arquillian.xml b/examples/jaxrs-json-provider-jettison/src/test/resources/arquillian.xml
index f03706a..2546d32 100755
--- a/examples/jaxrs-json-provider-jettison/src/test/resources/arquillian.xml
+++ b/examples/jaxrs-json-provider-jettison/src/test/resources/arquillian.xml
@@ -30,6 +30,7 @@
<property name="ajpPort">-1</property>
<property name="classifier">plus</property>
<property name="simpleLog">true</property>
+ <property name="debug">false</property>
<property name="cleanOnStartUp">true</property>
<property name="dir">target/server</property>
<property name="appWorkingDir">target/arquillian</property>
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index cb106b2..caf8d70 100644
--- a/examples/moviefun-rest/pom.xml
+++ b/examples/moviefun-rest/pom.xml
@@ -172,8 +172,6 @@
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
<version>8.0</version>
- <artifactId>javaee-api</artifactId>
- <version>8.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/examples/mp-metrics-metered/pom.xml b/examples/mp-metrics-metered/pom.xml
index ff3ed7e..6a0b2bae 100644
--- a/examples/mp-metrics-metered/pom.xml
+++ b/examples/mp-metrics-metered/pom.xml
@@ -74,6 +74,15 @@
<context>${project.artifactId}</context>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/examples/mp-rest-jwt/pom.xml b/examples/mp-rest-jwt/pom.xml
index 9bbe73e..7012f24 100644
--- a/examples/mp-rest-jwt/pom.xml
+++ b/examples/mp-rest-jwt/pom.xml
@@ -111,18 +111,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>2.4.0-b180830.0438</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
diff --git a/examples/mp-rest-jwt/src/test/resources/arquillian.xml b/examples/mp-rest-jwt/src/test/resources/arquillian.xml
index 4744e7a..75efc9a 100644
--- a/examples/mp-rest-jwt/src/test/resources/arquillian.xml
+++ b/examples/mp-rest-jwt/src/test/resources/arquillian.xml
@@ -25,6 +25,7 @@
<property name="httpPort">-1</property>
<property name="stopPort">-1</property>
<property name="classifier">microprofile</property>
+ <property name="debug">false</property>
<property name="dir">target/apache-tomee-remote</property>
<property name="appWorkingDir">target/arquillian-test-working-dir</property>
</configuration>
diff --git a/examples/polling-parent/polling-domain/pom.xml b/examples/polling-parent/polling-domain/pom.xml
index a989662..a84a6ad 100644
--- a/examples/polling-parent/polling-domain/pom.xml
+++ b/examples/polling-parent/polling-domain/pom.xml
@@ -37,10 +37,6 @@
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- </dependency>
- <dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
diff --git a/examples/polling-parent/pom.xml b/examples/polling-parent/pom.xml
index b2a926a..baa900c 100644
--- a/examples/polling-parent/pom.xml
+++ b/examples/polling-parent/pom.xml
@@ -106,6 +106,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
diff --git a/examples/simple-webservice/pom.xml b/examples/simple-webservice/pom.xml
index 45b4cab..79bb3ad 100644
--- a/examples/simple-webservice/pom.xml
+++ b/examples/simple-webservice/pom.xml
@@ -83,6 +83,45 @@
</dependencies>
+ <profiles>
+ <profile>
+ <id>active-on-jdk-11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <dependencies>
+ <!--
+ Java EE API replacements for JDK 11
+ -->
+ <!-- JAXB for Java 11 -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ <!-- CXF does not support 4.1 that comes with Sun WS implementation -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <!--<version>4.1</version>-->
+ <version>3.1.4</version>
+ </dependency>
+ <!-- JAXWS for Java 11 -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>rt</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<!--
This section allows you to configure where to publish libraries for sharing.
It is not required and may be deleted. For more information see:
diff --git a/examples/webservice-attachments/pom.xml b/examples/webservice-attachments/pom.xml
index 39ef30b..003d0d7 100644
--- a/examples/webservice-attachments/pom.xml
+++ b/examples/webservice-attachments/pom.xml
@@ -82,6 +82,45 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>active-on-jdk-11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <dependencies>
+ <!--
+ Java EE API replacements for JDK 11
+ -->
+ <!-- JAXB for Java 11 -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ <!-- CXF does not support 4.1 that comes with Sun WS implementation -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <!--<version>4.1</version>-->
+ <version>3.1.4</version>
+ </dependency>
+ <!-- JAXWS for Java 11 -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>rt</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<!--
This section allows you to configure where to publish libraries for sharing.
It is not required and may be deleted. For more information see:
diff --git a/examples/webservice-handlerchain/pom.xml b/examples/webservice-handlerchain/pom.xml
index 54f941e..7cacf6f 100644
--- a/examples/webservice-handlerchain/pom.xml
+++ b/examples/webservice-handlerchain/pom.xml
@@ -83,6 +83,45 @@
</dependencies>
+ <profiles>
+ <profile>
+ <id>active-on-jdk-11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <dependencies>
+ <!--
+ Java EE API replacements for JDK 11
+ -->
+ <!-- JAXB for Java 11 -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ <!-- CXF does not support 4.1 that comes with Sun WS implementation -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <!--<version>4.1</version>-->
+ <version>3.1.4</version>
+ </dependency>
+ <!-- JAXWS for Java 11 -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>rt</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<!--
This section allows you to configure where to publish libraries for sharing.
It is not required and may be deleted. For more information see:
diff --git a/examples/webservice-holder/pom.xml b/examples/webservice-holder/pom.xml
index 04f7fda..c795fcc 100644
--- a/examples/webservice-holder/pom.xml
+++ b/examples/webservice-holder/pom.xml
@@ -83,6 +83,45 @@
</dependencies>
+ <profiles>
+ <profile>
+ <id>active-on-jdk-11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <dependencies>
+ <!--
+ Java EE API replacements for JDK 11
+ -->
+ <!-- JAXB for Java 11 -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ <!-- CXF does not support 4.1 that comes with Sun WS implementation -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <!--<version>4.1</version>-->
+ <version>3.1.4</version>
+ </dependency>
+ <!-- JAXWS for Java 11 -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>rt</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<!--
This section allows you to configure where to publish libraries for sharing.
It is not required and may be deleted. For more information see:
diff --git a/examples/webservice-inheritance/pom.xml b/examples/webservice-inheritance/pom.xml
index 89153f5..4417ae7 100644
--- a/examples/webservice-inheritance/pom.xml
+++ b/examples/webservice-inheritance/pom.xml
@@ -94,6 +94,45 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>active-on-jdk-11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <dependencies>
+ <!--
+ Java EE API replacements for JDK 11
+ -->
+ <!-- JAXB for Java 11 -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ <!-- CXF does not support 4.1 that comes with Sun WS implementation -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <!--<version>4.1</version>-->
+ <version>3.1.4</version>
+ </dependency>
+ <!-- JAXWS for Java 11 -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>rt</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<!--
This section allows you to configure where to publish libraries for sharing.
It is not required and may be deleted. For more information see:
diff --git a/examples/webservice-security/pom.xml b/examples/webservice-security/pom.xml
index 6591c54..3ab9a20 100644
--- a/examples/webservice-security/pom.xml
+++ b/examples/webservice-security/pom.xml
@@ -82,6 +82,45 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>active-on-jdk-11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <dependencies>
+ <!--
+ Java EE API replacements for JDK 11
+ -->
+ <!-- JAXB for Java 11 -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ <!-- CXF does not support 4.1 that comes with Sun WS implementation -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <!--<version>4.1</version>-->
+ <version>3.1.4</version>
+ </dependency>
+ <!-- JAXWS for Java 11 -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>rt</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<!--
This section allows you to configure where to publish libraries for sharing.
It is not required and may be deleted. For more information see:
diff --git a/examples/webservice-ssl-client-cert/pom.xml b/examples/webservice-ssl-client-cert/pom.xml
index 3f81ec6..fbbe117 100644
--- a/examples/webservice-ssl-client-cert/pom.xml
+++ b/examples/webservice-ssl-client-cert/pom.xml
@@ -119,6 +119,45 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>active-on-jdk-11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <dependencies>
+ <!--
+ Java EE API replacements for JDK 11
+ -->
+ <!-- JAXB for Java 11 -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ <!-- CXF does not support 4.1 that comes with Sun WS implementation -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <!--<version>4.1</version>-->
+ <version>3.1.4</version>
+ </dependency>
+ <!-- JAXWS for Java 11 -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>rt</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<!--
This section allows you to configure where to publish libraries for sharing.
It is not required and may be deleted. For more information see:
diff --git a/examples/webservice-ws-security/pom.xml b/examples/webservice-ws-security/pom.xml
index ccd69ef..759d05a 100644
--- a/examples/webservice-ws-security/pom.xml
+++ b/examples/webservice-ws-security/pom.xml
@@ -159,5 +159,42 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>active-on-jdk-11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <dependencies>
+ <!--
+ Java EE API replacements for JDK 11
+ -->
+ <!-- JAXB for Java 11 -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ <!-- CXF does not support 4.1 that comes with Sun WS implementation -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <!--<version>4.1</version>-->
+ <version>3.1.4</version>
+ </dependency>
+ <!-- JAXWS for Java 11 -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>rt</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/webservice-ws-with-resources-config/pom.xml b/examples/webservice-ws-with-resources-config/pom.xml
index cb58292..de6c82b 100644
--- a/examples/webservice-ws-with-resources-config/pom.xml
+++ b/examples/webservice-ws-with-resources-config/pom.xml
@@ -61,6 +61,45 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>active-on-jdk-11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <dependencies>
+ <!--
+ Java EE API replacements for JDK 11
+ -->
+ <!-- JAXB for Java 11 -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ <!-- CXF does not support 4.1 that comes with Sun WS implementation -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <!--<version>4.1</version>-->
+ <version>3.1.4</version>
+ </dependency>
+ <!-- JAXWS for Java 11 -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>rt</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
<!--
This section allows you to configure where to publish libraries for sharing.
It is not required and may be deleted. For more information see:
diff --git a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
index 85cdbb9..41d6b80 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
@@ -294,7 +294,7 @@ public class MPJWTFilter implements Filter {
}
final String headerScheme = jwtAuthConfiguration.getHeaderScheme() + " ";
- if (headerScheme.trim().length() > 0 && !authorizationHeader.toLowerCase(Locale.ENGLISH).startsWith(headerScheme)) {
+ if (headerScheme.trim().length() > 0 && !authorizationHeader.toLowerCase(Locale.ENGLISH).startsWith(headerScheme.toLowerCase(Locale.ENGLISH))) {
throw new BadAuthorizationPrefixException(authorizationHeader);
}
diff --git a/pom.xml b/pom.xml
index a68d2d2..c315264 100644
--- a/pom.xml
+++ b/pom.xml
@@ -900,24 +900,68 @@
<version>3.9</version>
</dependency>
<dependency>
- <groupId>org.jboss.spec.javax.rmi</groupId>
- <artifactId>jboss-rmi-api_1.0_spec</artifactId>
- <version>1.0.6.Final</version>
- </dependency>
- <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>2.4.0-b180830.0438</version>
- </dependency>
- <dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>rt</artifactId>
<version>2.3.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jvnet.staxex</groupId>
+ <artifactId>stax-ex</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jvnet.mimepull</groupId>
+ <artifactId>mimepull</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>woodstox-core</artifactId>
+ <groupId>com.fasterxml.woodstox</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.org.apache.xml.internal</groupId>
+ <artifactId>resolver</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.glassfish.ha</groupId>
+ <artifactId>ha-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
+ <!--<exclusion>-->
+ <!--<groupId>javax.xml.soap</groupId>-->
+ <!--<artifactId>javax.xml.soap-api</artifactId>-->
+ <!--</exclusion>-->
+ <exclusion>
+ <groupId>javax.jws</groupId>
+ <artifactId>javax.jws-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
@@ -930,11 +974,6 @@
<version>1.2.0</version>
</dependency>
<dependency>
- <groupId>org.jacorb</groupId>
- <artifactId>jacorb</artifactId>
- <version>3.9</version>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.rmi</groupId>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
<version>1.0.6.Final</version>
@@ -1894,6 +1933,22 @@
<artifactId>jakarta.activation</artifactId>
<groupId>jakarta.activation-api</groupId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>txw2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jvnet.staxex</groupId>
+ <artifactId>stax-ex</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency> <!-- licence apache, only 110ko -->
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index cad9533..dd04374 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -247,5 +247,41 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>active-on-jdk-11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <dependencies>
+ <!--
+ Java EE API replacements for JDK 11
+ -->
+ <!-- JAXB for Java 11 -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ <!-- CXF does not support 4.1 that comes with Sun WS implementation -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <!--<version>4.1</version>-->
+ <version>3.1.4</version>
+ </dependency>
+ <!-- JAXWS for Java 11 -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>rt</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/server/openejb-webservices/src/test/java/org/apache/openejb/server/webservices/saaj/SaajUniverseTest.java b/server/openejb-webservices/src/test/java/org/apache/openejb/server/webservices/saaj/SaajUniverseTest.java
index 6312510..9d247ad 100644
--- a/server/openejb-webservices/src/test/java/org/apache/openejb/server/webservices/saaj/SaajUniverseTest.java
+++ b/server/openejb-webservices/src/test/java/org/apache/openejb/server/webservices/saaj/SaajUniverseTest.java
@@ -39,7 +39,7 @@ public class SaajUniverseTest extends TestCase {
public void testBasic() throws Exception {
// case 1, universe not set
- //assertEquals(DEFAULT_MESSAGE_CLASS, MessageFactory.newInstance().createMessage().getClass().getName());
+ assertEquals(DEFAULT_MESSAGE_CLASS, MessageFactory.newInstance().createMessage().getClass().getName());
// case 2, default universe set
SaajUniverse u = new SaajUniverse();
[tomee] 29/31: Update mockito and fix
java.lang.NoClassDefFoundError for jaxb
Posted by jl...@apache.org.
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 89e0544fbcc3ad423c100da9ef5a7b0e8b24a8e3
Author: Daniel Cunha (soro) <da...@apache.org>
AuthorDate: Sat Mar 2 04:15:45 2019 -0300
Update mockito and fix java.lang.NoClassDefFoundError for jaxb
---
utils/openejb-mockito/pom.xml | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/utils/openejb-mockito/pom.xml b/utils/openejb-mockito/pom.xml
index e3fa0be..1ec0aec 100644
--- a/utils/openejb-mockito/pom.xml
+++ b/utils/openejb-mockito/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.7.9</version>
+ <version>2.20.0</version>
<exclusions>
<exclusion>
<artifactId>hamcrest-core</artifactId>
@@ -47,5 +47,13 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
</dependencies>
</project>
[tomee] 23/31: Stashing this change
Posted by jl...@apache.org.
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 f54573e82e4c459fa8512cb881e2d18d8200db0a
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Fri Feb 8 14:38:07 2019 +0000
Stashing this change
---
container/openejb-core/pom.xml | 5 -----
pom.xml | 6 ------
2 files changed, 11 deletions(-)
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 7c3ca32..9266d4f 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -444,11 +444,6 @@
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
<artifactId>rt</artifactId>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index dcdaf55..9620136 100644
--- a/pom.xml
+++ b/pom.xml
@@ -906,12 +906,6 @@
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>2.3.1</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
<artifactId>rt</artifactId>
<version>2.3.1</version>
</dependency>
[tomee] 07/31: Revert "TOMEE-2354 - Simplified TomEE Plus tests
execution."
Posted by jl...@apache.org.
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 3dd0c3146fd495b1a3d02d1a3ac13a2d2ddc4582
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Dec 19 01:22:29 2018 +0000
Revert "TOMEE-2354 - Simplified TomEE Plus tests execution."
This reverts commit af409ec0e913f4f9e08b5c5a01c064a09543219b.
---
tck/microprofile-tck/config/pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index 993477e..68f314c 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -44,6 +44,14 @@
<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>
[tomee] 01/31: Adding new modules to the build as they have been
removed from the JDK
Posted by jl...@apache.org.
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 d7e8e95068ba70e0d57d73f2f44a6ac013be2dbf
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Mon Dec 17 15:18:06 2018 +0000
Adding new modules to the build as they have been removed from the JDK
---
container/openejb-core/pom.xml | 20 ++++++++++++++++++++
pom.xml | 25 +++++++++++++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index b0ab010..df5d188 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -427,6 +427,26 @@
<dependencies>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mbean-annotation-api</artifactId>
<version>${project.version}</version>
diff --git a/pom.xml b/pom.xml
index f57c072..5c61c59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -896,6 +896,31 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb</artifactId>
+ <version>3.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ <version>1.0.6.Final</version>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
<version>${version.javaee-api}</version>
[tomee] 13/31: Try adding the --add-opens from the catalina.sh
script when running on Java 9+
Posted by jl...@apache.org.
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 6f081366dd09bf88f1ddcd3f5eb83e9fa61d3265
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Fri Jan 4 14:43:14 2019 +0000
Try adding the --add-opens from the catalina.sh script when running on Java 9+
---
.../src/main/java/org/apache/openejb/config/RemoteServer.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
index 8f1705f..62abf59 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
@@ -17,6 +17,7 @@
package org.apache.openejb.config;
+import org.apache.commons.lang3.JavaVersion;
import org.apache.openejb.OpenEJBRuntimeException;
import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.Options;
@@ -329,6 +330,14 @@ public class RemoteServer {
addIfSet(argsList, "java.protocol.handler.pkgs");
}
+ // add modules needed in Java 9+
+ double version = Double.parseDouble(System.getProperty("java.specification.version"));
+ if (version >= 9) {
+ argsList.add("--add-opens=java.base/java.lang=ALL-UNNAMED");
+ argsList.add("--add-opens=java.base/java.io=ALL-UNNAMED");
+ argsList.add("--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED");
+ }
+
argsList.add("-ea");
argsList.add("-classpath");
[tomee] 26/31: Adding exclude back and removing com.sun.xml.ws
Posted by jl...@apache.org.
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 3b687656433c9892e69d24017061a7109cd71324
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Fri Mar 1 15:57:52 2019 +0000
Adding exclude back and removing com.sun.xml.ws
---
server/openejb-cxf/pom.xml | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index cb66c32..cad9533 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -215,20 +215,6 @@
<version>1.4.2</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>2.3.1</version>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>rt</artifactId>
- <version>2.3.1</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<profiles>
[tomee] 27/31: Further cleanup
Posted by jl...@apache.org.
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 0c210dd18c7046e44566eb82b27bcec342581719
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Fri Mar 1 16:03:09 2019 +0000
Further cleanup
---
container/openejb-core/pom.xml | 4 ----
examples/moviefun-rest/pom.xml | 12 ------------
examples/rest-cdi/pom.xml | 12 ------------
3 files changed, 28 deletions(-)
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 9266d4f..0ca717a 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -451,10 +451,6 @@
<artifactId>jacorb</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.spec.javax.rmi</groupId>
- <artifactId>jboss-rmi-api_1.0_spec</artifactId>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mbean-annotation-api</artifactId>
<version>${project.version}</version>
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index 3f3bd36..cb106b2 100644
--- a/examples/moviefun-rest/pom.xml
+++ b/examples/moviefun-rest/pom.xml
@@ -177,18 +177,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>2.4.0-b180830.0438</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
diff --git a/examples/rest-cdi/pom.xml b/examples/rest-cdi/pom.xml
index 91ad785..d51ae0b 100644
--- a/examples/rest-cdi/pom.xml
+++ b/examples/rest-cdi/pom.xml
@@ -60,18 +60,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>2.4.0-b180830.0438</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
[tomee] 04/31: Revert "TOMEE-2354 - Fixed Plus NOTICE files."
Posted by jl...@apache.org.
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 e67a23d902ff65cf3039c7c0e380d2a547441606
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Dec 19 01:21:21 2018 +0000
Revert "TOMEE-2354 - Fixed Plus NOTICE files."
This reverts commit 79c965185ea5d1d35dd4b476ac6ca7ce224e2c05.
---
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 insertions(+)
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 ae8ebf3..7eb273a 100644
--- a/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE
+++ b/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE
@@ -183,6 +183,7 @@ 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
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 ae8ebf3..7eb273a 100644
--- a/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE
+++ b/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE
@@ -183,6 +183,7 @@ 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
[tomee] 16/31: WIP experimentation
Posted by jl...@apache.org.
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 a1921d52bcb6eacc0058296efd53ceb055cac865
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Sat Jan 5 13:08:06 2019 +0000
WIP experimentation
---
container/openejb-core/pom.xml | 8 ++++++++
pom.xml | 13 ++++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 9234fb8..840f724 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -443,6 +443,14 @@
<artifactId>javax.activation</artifactId>
</dependency>
<dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>rt</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jacorb</groupId>
<artifactId>jacorb</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
index d8adac8..0d4a030 100644
--- a/pom.xml
+++ b/pom.xml
@@ -902,7 +902,18 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>rt</artifactId>
+ <version>2.3.1</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
[tomee] 03/31: Revert "TOMEE-2355 - Added MicroProfile Support to
TomEE Plume."
Posted by jl...@apache.org.
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 69401ef6d0761eb0f5537552c90df017ec460cc3
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Dec 19 01:21:13 2018 +0000
Revert "TOMEE-2355 - Added MicroProfile Support to TomEE Plume."
This reverts commit 8968aa071d5694a0eb13e62f3680248ee9c910d1.
---
.../src/main/resources/META-INF/plume/NOTICE | 23 -------
.../src/main/resources/META-INF/NOTICE | 75 +---------------------
2 files changed, 3 insertions(+), 95 deletions(-)
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 d1e0f9b..6cec2de 100644
--- a/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE
+++ b/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE
@@ -168,26 +168,3 @@ 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 d1e0f9b..f5ea6ba 100644
--- a/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE
+++ b/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE
@@ -54,22 +54,6 @@ 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/)
@@ -92,36 +76,6 @@ 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)
@@ -150,12 +104,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).
=========================================================================
-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
=========================================================================
+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
+=========================================================================
Apache XBean :: ASM shaded (repackaged)
Copyright 2005-2013 The Apache Software Foundation
@@ -168,26 +122,3 @@ 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.
-=========================================================================
[tomee] 06/31: Revert "TOMEE-2354 - Update all MP TCK to execute on
TomEE Plus with a build profile."
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch tomee8-java11
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit e476eae1853448a94565ceb9496049a2df2e0457
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Dec 19 01:22:21 2018 +0000
Revert "TOMEE-2354 - Update all MP TCK to execute on TomEE Plus with a build profile."
This reverts commit 3948d2b7972e2a3168469e69cb945af970758604.
---
tck/microprofile-tck/fault-tolerance/pom.xml | 27 -------------------
.../src/test/resources/arquillian.xml | 3 ++-
tck/microprofile-tck/health/pom.xml | 27 -------------------
.../health/src/test/resources/arquillian.xml | 3 ++-
tck/microprofile-tck/jwt/pom.xml | 30 ++--------------------
tck/microprofile-tck/metrics/pom.xml | 27 -------------------
.../metrics/src/test/resources/arquillian.xml | 3 ++-
tck/microprofile-tck/openapi/pom.xml | 28 +-------------------
.../openapi/src/test/resources/arquillian.xml | 7 ++++-
tck/microprofile-tck/opentracing/pom.xml | 27 -------------------
.../opentracing/src/test/resources/arquillian.xml | 3 ++-
tck/microprofile-tck/rest-client/pom.xml | 27 -------------------
.../rest-client/src/test/resources/arquillian.xml | 3 ++-
13 files changed, 19 insertions(+), 196 deletions(-)
diff --git a/tck/microprofile-tck/fault-tolerance/pom.xml b/tck/microprofile-tck/fault-tolerance/pom.xml
index 4fc0ad4..aa95c3d 100644
--- a/tck/microprofile-tck/fault-tolerance/pom.xml
+++ b/tck/microprofile-tck/fault-tolerance/pom.xml
@@ -44,33 +44,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>mp-tck-all</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>tomee-plus</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <arquillian.launch>tomee-plus</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile.fault-tolerance</groupId>
diff --git a/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml b/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
index 9fc654b..2eee01c 100644
--- a/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
@@ -21,8 +21,9 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-microprofile" default="true">
+ <container qualifier="tomee-remote" default="true">
<configuration>
+ <property name="debug">false</property>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
diff --git a/tck/microprofile-tck/health/pom.xml b/tck/microprofile-tck/health/pom.xml
index 62dee30..973472a 100644
--- a/tck/microprofile-tck/health/pom.xml
+++ b/tck/microprofile-tck/health/pom.xml
@@ -43,33 +43,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>mp-tck-all</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>tomee-plus</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <arquillian.launch>tomee-plus</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile.health</groupId>
diff --git a/tck/microprofile-tck/health/src/test/resources/arquillian.xml b/tck/microprofile-tck/health/src/test/resources/arquillian.xml
index 9fc654b..2eee01c 100644
--- a/tck/microprofile-tck/health/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/health/src/test/resources/arquillian.xml
@@ -21,8 +21,9 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-microprofile" default="true">
+ <container qualifier="tomee-remote" default="true">
<configuration>
+ <property name="debug">false</property>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index eb6dd19..a0e9ed2 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -172,6 +172,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.17</version>
<configuration>
<suiteXmlFiles>
<!-- TCK does not deliver the xml file for the moment -->
@@ -184,6 +185,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.17</version>
<executions>
<execution>
<id>generate-test-report</id>
@@ -200,32 +202,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>mp-tck-all</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>tomee-plus</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <arquillian.launch>tomee-plus</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/tck/microprofile-tck/metrics/pom.xml b/tck/microprofile-tck/metrics/pom.xml
index c5fc0c3..9d77818 100644
--- a/tck/microprofile-tck/metrics/pom.xml
+++ b/tck/microprofile-tck/metrics/pom.xml
@@ -51,33 +51,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>mp-tck-all</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>tomee-plus</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <arquillian.launch>tomee-plus</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile.metrics</groupId>
diff --git a/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml b/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml
index ce97b1d..d585110 100644
--- a/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml
@@ -21,8 +21,9 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-microprofile" default="true">
+ <container qualifier="tomee-remote" default="true">
<configuration>
+ <property name="debug">false</property>
<property name="httpPort">50290</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
diff --git a/tck/microprofile-tck/openapi/pom.xml b/tck/microprofile-tck/openapi/pom.xml
index 5b6279d..44861b0 100644
--- a/tck/microprofile-tck/openapi/pom.xml
+++ b/tck/microprofile-tck/openapi/pom.xml
@@ -35,6 +35,7 @@
<!-- Updated version to fix hanging text -->
<version>2.22.0</version>
<configuration>
+ <!-- TODO - Requires the JsonB JAX-RS Provider -->
<dependenciesToScan>
<dependency>org.eclipse.microprofile.openapi:microprofile-openapi-tck</dependency>
</dependenciesToScan>
@@ -55,33 +56,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>mp-tck-all</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>tomee-plus</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <arquillian.launch>tomee-plus</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile.openapi</groupId>
diff --git a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
index 6b3b59a..33d3df5 100644
--- a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
@@ -21,8 +21,9 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-microprofile" default="true">
+ <container qualifier="tomee-remote" default="true">
<configuration>
+ <property name="debug">false</property>
<property name="httpPort">50290</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
@@ -31,6 +32,10 @@
<property name="dir">target/tomee</property>
<property name="appWorkingDir">target/workdir</property>
<property name="cleanOnStartUp">true</property>
+ <property name="properties">
+ <!-- TODO - The final dist should include this property -->
+ openejb.cxf-rs.cache-application = false
+ </property>
</configuration>
</container>
<container qualifier="tomee-plus">
diff --git a/tck/microprofile-tck/opentracing/pom.xml b/tck/microprofile-tck/opentracing/pom.xml
index 09ca8a9..73b3662 100644
--- a/tck/microprofile-tck/opentracing/pom.xml
+++ b/tck/microprofile-tck/opentracing/pom.xml
@@ -43,33 +43,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>mp-tck-all</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>tomee-plus</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <arquillian.launch>tomee-plus</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile.opentracing</groupId>
diff --git a/tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml b/tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml
index 45f33f9..d5b5a0f 100644
--- a/tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml
@@ -20,8 +20,9 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-microprofile" default="true">
+ <container qualifier="tomee-remote" default="true">
<configuration>
+ <property name="debug">false</property>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml
index 2f7aa01..54df529 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -73,33 +73,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>mp-tck-all</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>tomee-plus</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <arquillian.launch>tomee-plus</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile.rest.client</groupId>
diff --git a/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml b/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
index e17f109..f46dedf 100644
--- a/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
@@ -21,8 +21,9 @@
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomee-microprofile" default="true">
+ <container qualifier="tomee-remote" default="true">
<configuration>
+ <property name="debug">false</property>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
[tomee] 22/31: Sync up with master
Posted by jl...@apache.org.
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.
+=========================================================================
[tomee] 20/31: Fix test
Posted by jl...@apache.org.
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 dda9ed141e4b7d4876f8538a8e3c309548e8d677
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Sun Jan 6 21:43:36 2019 +0000
Fix test
---
.../arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
index 0f68384..b664fa2 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
@@ -29,7 +29,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.
- org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.ver1_2.SOAPMessageFactory1_2Impl
+ #org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.ver1_2.SOAPMessageFactory1_2Impl
</property>
</configuration>
</container>
@@ -44,7 +44,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests
- org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.ver1_2.SOAPMessageFactory1_2Impl
+ #org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.ver1_2.SOAPMessageFactory1_2Impl
</property>
</configuration>
</container>
@@ -74,7 +74,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.
- org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.ver1_2.SOAPMessageFactory1_2Impl
+ #org.apache.cxf.binding.soap.messageFactoryClassName=com.sun.xml.messaging.saaj.soap.ver1_2.SOAPMessageFactory1_2Impl
</property>
</configuration>
</container>
[tomee] 18/31: WIP - modules
Posted by jl...@apache.org.
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 df272b2bcdc6b3c6d48b697f9e6ccd188e80ee86
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Sun Jan 6 21:27:57 2019 +0000
WIP - modules
---
arquillian/ziplock/pom.xml | 9 +-
examples/java-modules/pom.xml | 112 ++++++++++++-------------
examples/moviefun-rest/pom.xml | 14 ++++
examples/mp-config-example/pom.xml | 48 ++++++-----
examples/mp-rest-client/pom.xml | 92 +++++++++++---------
examples/mp-rest-jwt/pom.xml | 12 +++
examples/polling-parent/polling-domain/pom.xml | 8 ++
examples/polling-parent/pom.xml | 12 +++
examples/pom.xml | 2 +-
examples/rest-cdi/pom.xml | 15 +++-
examples/rest-example/pom.xml | 12 +++
examples/rest-on-ejb/pom.xml | 12 +++
examples/rest-xml-json/pom.xml | 13 ++-
examples/tomee-jersey-eclipselink/pom.xml | 12 +++
examples/webservice-inheritance/pom.xml | 12 +++
tck/bval-tomee/pom.xml | 12 +++
tomee/apache-tomee/pom.xml | 18 +++-
17 files changed, 291 insertions(+), 124 deletions(-)
diff --git a/arquillian/ziplock/pom.xml b/arquillian/ziplock/pom.xml
index dc6e824..843f09f 100644
--- a/arquillian/ziplock/pom.xml
+++ b/arquillian/ziplock/pom.xml
@@ -55,7 +55,14 @@
<artifactId>javaee-api</artifactId>
<version>${version.javaee-api}</version>
</dependency>
-
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/examples/java-modules/pom.xml b/examples/java-modules/pom.xml
index 6ceeddf..5b64f04 100644
--- a/examples/java-modules/pom.xml
+++ b/examples/java-modules/pom.xml
@@ -49,60 +49,60 @@
</pluginRepository>
</pluginRepositories>
- <build>
- <defaultGoal>package</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>javaee-api</artifactId>
- <version>8.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${tomee.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>arquillian-tomee-remote</artifactId>
- <version>${tomee.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <version>${arquillian.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <!--
- This section allows you to configure where to publish libraries for sharing.
- It is not required and may be deleted. For more information see:
- http://maven.apache.org/plugins/maven-deploy-plugin/
- -->
- <distributionManagement>
- <repository>
- <id>local-release-repo</id>
- <url>file://${project.build.outputDirectory}/repo/</url>
- </repository>
- <snapshotRepository>
- <id>local-snapshot-repo</id>
- <url>file://${project.build.outputDirectory}/repo/</url>
- </snapshotRepository>
- </distributionManagement>
+ <build>
+ <defaultGoal>package</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>8.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${tomee.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <version>${tomee.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <version>${arquillian.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <!--
+ This section allows you to configure where to publish libraries for sharing.
+ It is not required and may be deleted. For more information see:
+ http://maven.apache.org/plugins/maven-deploy-plugin/
+ -->
+ <distributionManagement>
+ <repository>
+ <id>local-release-repo</id>
+ <url>file://${project.build.outputDirectory}/repo/</url>
+ </repository>
+ <snapshotRepository>
+ <id>local-snapshot-repo</id>
+ <url>file://${project.build.outputDirectory}/repo/</url>
+ </snapshotRepository>
+ </distributionManagement>
</project>
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index 1e1d882..134aedc 100644
--- a/examples/moviefun-rest/pom.xml
+++ b/examples/moviefun-rest/pom.xml
@@ -172,6 +172,20 @@
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
<version>8.0</version>
+ <artifactId>javaee-api</artifactId>
+ <version>8.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/examples/mp-config-example/pom.xml b/examples/mp-config-example/pom.xml
index b68cd6b..da43d4b 100644
--- a/examples/mp-config-example/pom.xml
+++ b/examples/mp-config-example/pom.xml
@@ -66,26 +66,34 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.tomee.maven</groupId>
- <artifactId>tomee-maven-plugin</artifactId>
- <version>${tomee.version}</version>
- <configuration>
- <tomeeClassifier>microprofile</tomeeClassifier>
- <context>${project.artifactId}</context>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.1.0</version>
- <configuration>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.5.1</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomee.maven</groupId>
+ <artifactId>tomee-maven-plugin</artifactId>
+ <version>${tomee.version}</version>
+ <configuration>
+ <tomeeClassifier>microprofile</tomeeClassifier>
+ <context>${project.artifactId}</context>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<!-- This section allows you to configure where to publish libraries for
sharing. It is not required and may be deleted. For more information see:
diff --git a/examples/mp-rest-client/pom.xml b/examples/mp-rest-client/pom.xml
index e81500a..48c30d4 100755
--- a/examples/mp-rest-client/pom.xml
+++ b/examples/mp-rest-client/pom.xml
@@ -45,47 +45,57 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.microprofile.rest.client</groupId>
- <artifactId>microprofile-rest-client-api</artifactId>
- <version>${microprofile.rest-client.version}</version>
- <scope>provided</scope>
- </dependency>
-
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-cxf-rs</artifactId>
- <version>${tomee.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <version>${version.arquillian.bom}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>arquillian-tomee-remote</artifactId>
- <version>${tomee.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
- <type>zip</type>
- <classifier>microprofile</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.eclipse.microprofile.rest.client</groupId>
+ <artifactId>microprofile-rest-client-api</artifactId>
+ <version>${microprofile.rest-client.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>openejb-cxf-rs</artifactId>
+ <version>${tomee.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <version>${version.arquillian.bom}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <version>${tomee.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${tomee.version}</version>
+ <type>zip</type>
+ <classifier>microprofile</classifier>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
diff --git a/examples/mp-rest-jwt/pom.xml b/examples/mp-rest-jwt/pom.xml
index 92cbd9f..fc17871 100644
--- a/examples/mp-rest-jwt/pom.xml
+++ b/examples/mp-rest-jwt/pom.xml
@@ -111,6 +111,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>4.23</version>
diff --git a/examples/polling-parent/polling-domain/pom.xml b/examples/polling-parent/polling-domain/pom.xml
index feb617c..c40864e 100644
--- a/examples/polling-parent/polling-domain/pom.xml
+++ b/examples/polling-parent/polling-domain/pom.xml
@@ -32,6 +32,14 @@
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/examples/polling-parent/pom.xml b/examples/polling-parent/pom.xml
index 94659ce..6bc7918 100644
--- a/examples/polling-parent/pom.xml
+++ b/examples/polling-parent/pom.xml
@@ -105,6 +105,18 @@
<version>${tomee.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ <scope>provided</scope>
+ </dependency>
<!-- test -->
<dependency>
diff --git a/examples/pom.xml b/examples/pom.xml
index f739dc1..b18ed65 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -143,7 +143,7 @@
<module>rest-example</module>
<module>rest-example-with-application</module>
<module>rest-xml-json</module>
- <module>scala-basic</module>
+ <!--<module>scala-basic</module>-->
<module>schedule-expression</module>
<module>schedule-events</module>
<module>schedule-methods-meta</module>
diff --git a/examples/rest-cdi/pom.xml b/examples/rest-cdi/pom.xml
index 925c98d..2da7da1 100644
--- a/examples/rest-cdi/pom.xml
+++ b/examples/rest-cdi/pom.xml
@@ -56,10 +56,21 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
- <version>8.0</version>
+ <version>8.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml
index 716e120..99f19f3 100644
--- a/examples/rest-example/pom.xml
+++ b/examples/rest-example/pom.xml
@@ -122,6 +122,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
diff --git a/examples/rest-on-ejb/pom.xml b/examples/rest-on-ejb/pom.xml
index 8787b7b..b66558c 100644
--- a/examples/rest-on-ejb/pom.xml
+++ b/examples/rest-on-ejb/pom.xml
@@ -72,6 +72,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
diff --git a/examples/rest-xml-json/pom.xml b/examples/rest-xml-json/pom.xml
index 78fda09..7c67b41 100644
--- a/examples/rest-xml-json/pom.xml
+++ b/examples/rest-xml-json/pom.xml
@@ -59,7 +59,18 @@
<version>8.0</version>
<scope>provided</scope>
</dependency>
-
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/examples/tomee-jersey-eclipselink/pom.xml b/examples/tomee-jersey-eclipselink/pom.xml
index 5176067..7e98bfc 100644
--- a/examples/tomee-jersey-eclipselink/pom.xml
+++ b/examples/tomee-jersey-eclipselink/pom.xml
@@ -40,6 +40,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.core</artifactId>
<version>${version.eclipselink}</version>
diff --git a/examples/webservice-inheritance/pom.xml b/examples/webservice-inheritance/pom.xml
index c80e6be..04d4336 100644
--- a/examples/webservice-inheritance/pom.xml
+++ b/examples/webservice-inheritance/pom.xml
@@ -57,6 +57,18 @@
<version>8.0</version>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
diff --git a/tck/bval-tomee/pom.xml b/tck/bval-tomee/pom.xml
index 3ac5b1c..d166886 100644
--- a/tck/bval-tomee/pom.xml
+++ b/tck/bval-tomee/pom.xml
@@ -173,6 +173,18 @@
<parallel>classes</parallel>
<threadCount>1</threadCount>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index bcb4ac1..b5b7d63 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -159,7 +159,7 @@
</archive>
</configuration>
</plugin>
- <plugin>
+ <!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
@@ -170,7 +170,21 @@
</goals>
</execution>
</executions>
- </plugin>
+ <configuration>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>