From 3da7b8ff94f5a15736bf07767f069863b3504ecc Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Sun, 20 Jan 2019 22:20:25 +0100
Subject: [PATCH] Adding jabx dependency for JDK11

The dependency is needed by enunciate plugin. It is not sufficient to add it as plugin dependency.
Using profile for selecting JDK9+ only and adding it as 'provided' scope.
---
 .../archiva-rest/archiva-rest-api/pom.xml     | 23 +++++++++++++++++++
 .../archiva-web/archiva-web-common/pom.xml    | 23 +++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
index e4ee61e5a..e2daaab12 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
@@ -110,4 +110,27 @@
     </plugins>
   </build>
 
+  <!-- 
+    The jaxb dependency is needed by the enunciate plugin starting with JDK9. 
+    Adding to the plugin dependency is not sufficient, so I have to add it as project dependency. 
+    Using provided scope to avoid adding it to packaging.
+  -->
+  <profiles>
+    <profile>
+      <id>jdk9+</id>
+      <activation>
+        <jdk>[1.9,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>2.3.0</version>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
+
 </project>
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index f7b86786c..24a4ec8fa 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -491,4 +491,27 @@
     </plugins>
   </build>
 
+  <!-- 
+    The jaxb dependency is needed by the enunciate plugin starting with JDK9. 
+    Adding to the plugin dependency is not sufficient, so I have to add it as project dependency. 
+    Using provided scope to avoid adding it to packaging.
+  -->
+  <profiles>
+    <profile>
+      <id>jdk9+</id>
+      <activation>
+        <jdk>[1.9,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>2.3.0</version>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
+
 </project>
-- 
2.39.5