From 26b43f8167905b511f8340c1bb1f8fb4ade34238 Mon Sep 17 00:00:00 2001
From: Jean-Louis Monteiro <jlmonteiro@tomitribe.com>
Date: Mon, 28 Sep 2020 15:11:04 +0200
Subject: [PATCH] Make sure build, tests and TCK run with JDK11

---
 bval-jsr/pom.xml  |  6 +++---
 bval-perf/pom.xml | 12 ------------
 bval-tck/pom.xml  | 36 ++++++++++++++++++++++++++++++++++--
 pom.xml           |  2 +-
 4 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/bval-jsr/pom.xml b/bval-jsr/pom.xml
index 06bde7cd..7c4f79e5 100644
--- a/bval-jsr/pom.xml
+++ b/bval-jsr/pom.xml
@@ -57,9 +57,9 @@
                     <scope>provided</scope>
                 </dependency>
                 <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-core</artifactId>
-                    <version>2.3.0</version>
+                    <groupId>org.glassfish.jaxb</groupId>
+                    <artifactId>jaxb-runtime</artifactId>
+                    <version>2.3.2</version>
                     <scope>provided</scope>
                 </dependency>
                 <dependency>
diff --git a/bval-perf/pom.xml b/bval-perf/pom.xml
index c5ab7ce4..ce2be007 100644
--- a/bval-perf/pom.xml
+++ b/bval-perf/pom.xml
@@ -83,16 +83,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>9</source>
-          <target>9</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/bval-tck/pom.xml b/bval-tck/pom.xml
index 92a1f92d..2f884ede 100644
--- a/bval-tck/pom.xml
+++ b/bval-tck/pom.xml
@@ -31,8 +31,8 @@ under the License.
     <description>Aggregates dependencies and runs the JSR-380 TCK</description>
 
     <properties>
-        <tck.version>2.0.4.Final</tck.version>
-        <owb.version>2.0.4</owb.version>
+        <tck.version>2.0.5</tck.version>
+        <owb.version>2.0.18</owb.version>
         <arquillian.version>1.1.11.Final</arquillian.version>
         <validation.provider>org.apache.bval.jsr.ApacheValidationProvider</validation.provider>
     </properties>
@@ -148,6 +148,38 @@ under the License.
     </dependencies>
 
     <profiles>
+        <profile>
+            <id>java11</id>
+            <activation>
+                <jdk>11</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                    <version>1.1</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.3.2</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.openjfx</groupId>
+                    <artifactId>javafx-base</artifactId>
+                    <version>11</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
         <profile>
             <id>tck</id>
             <activation>
diff --git a/pom.xml b/pom.xml
index 60437ab2..365afac2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -572,7 +572,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.20.1</version>
+                    <version>2.22.2</version>
                     <configuration>
                         <trimStackTrace>false</trimStackTrace>
                     </configuration>