You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2021/09/22 15:33:32 UTC
[tomee] branch master updated: Attempting to actually build the
project with Java 17
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 17f2a99 Attempting to actually build the project with Java 17
17f2a99 is described below
commit 17f2a9981d48be4344b947785d8266a0aeaed1ac
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Sep 22 16:32:44 2021 +0100
Attempting to actually build the project with Java 17
---
tck/bval-tomee/pom.xml | 8 ++++++++
tck/microprofile-tck/pom.xml | 45 +++++++++++++++++++++++++++++++++-----------
tomee/apache-tomee/pom.xml | 8 ++++++++
3 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/tck/bval-tomee/pom.xml b/tck/bval-tomee/pom.xml
index 85326f0..c307d0c 100644
--- a/tck/bval-tomee/pom.xml
+++ b/tck/bval-tomee/pom.xml
@@ -173,6 +173,14 @@
<parallel>classes</parallel>
<threadCount>1</threadCount>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
diff --git a/tck/microprofile-tck/pom.xml b/tck/microprofile-tck/pom.xml
index 0af43ff..fcd0be2 100644
--- a/tck/microprofile-tck/pom.xml
+++ b/tck/microprofile-tck/pom.xml
@@ -29,15 +29,38 @@
<packaging>pom</packaging>
<name>TomEE :: TCK :: MicroProfile</name>
- <modules>
- <module>config</module>
- <module>jwt</module>
- <module>fault-tolerance</module>
- <module>health</module>
- <module>metrics</module>
- <module>rest-client</module>
- <module>openapi</module>
- <module>opentracing</module>
- </modules>
-
+ <!-- JWT TCK has a dependency on Nashorn, which has disappeared in JDK12 onwards, we'll need to test on JDK 11 for now -->
+ <profiles>
+ <profile>
+ <id>java12plus</id>
+ <activation>
+ <jdk>[12,)</jdk>
+ </activation>
+ <modules>
+ <module>config</module>
+ <module>fault-tolerance</module>
+ <module>health</module>
+ <module>metrics</module>
+ <module>rest-client</module>
+ <module>openapi</module>
+ <module>opentracing</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>main</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>config</module>
+ <module>jwt</module>
+ <module>fault-tolerance</module>
+ <module>health</module>
+ <module>metrics</module>
+ <module>rest-client</module>
+ <module>openapi</module>
+ <module>opentracing</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index 7e3d770..fd3f4b2 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -186,6 +186,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<goals>