This is an automated email from the ASF dual-hosted git repository.

olamy pushed a commit to branch archiva-2.x-gh-actions
in repository https://gitbox.apache.org/repos/asf/archiva.git


The following commit(s) were added to refs/heads/archiva-2.x-gh-actions by this 
push:
     new 343f2bec5 fix build with jdk 11
343f2bec5 is described below

commit 343f2bec54cbebcd76041b31500711e75f03f5ae
Author: Olivier Lamy <[email protected]>
AuthorDate: Sun Apr 10 10:42:08 2022 +1000

    fix build with jdk 11
    
    Signed-off-by: Olivier Lamy <[email protected]>
---
 .../archiva-base/archiva-maven2-model/pom.xml      | 17 +++++++++++++++
 .../archiva-repository-admin-api/pom.xml           | 16 ++++++++++++++
 archiva-modules/metadata/metadata-model/pom.xml    | 18 ++++++++++++++++
 pom.xml                                            | 25 ++++++++++++++++++++++
 4 files changed, 76 insertions(+)

diff --git a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml 
b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
index 249f7c38d..1867413e2 100644
--- a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
+++ b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
@@ -59,4 +59,21 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>jdk9+</id>
+      <activation>
+        <jdk>[1.9,)</jdk>
+      </activation>
+      <dependencies>
+        <!-- needed for jdk 11 -->
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>2.3.1</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
 </project>
diff --git 
a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
 
b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
index 31e93f4e1..9a1acb35a 100644
--- 
a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
+++ 
b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
@@ -113,5 +113,21 @@
       </plugin>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <id>jdk9+</id>
+      <activation>
+        <jdk>[1.9,)</jdk>
+      </activation>
+      <dependencies>
+        <!-- needed for jdk 11 -->
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>2.3.1</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 
 </project>
diff --git a/archiva-modules/metadata/metadata-model/pom.xml 
b/archiva-modules/metadata/metadata-model/pom.xml
index a38a8736f..420d1bcf4 100644
--- a/archiva-modules/metadata/metadata-model/pom.xml
+++ b/archiva-modules/metadata/metadata-model/pom.xml
@@ -55,4 +55,22 @@
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>jdk9+</id>
+      <activation>
+        <jdk>[1.9,)</jdk>
+      </activation>
+      <dependencies>
+        <!-- needed for jdk 11 -->
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>2.3.1</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/pom.xml b/pom.xml
index fbbf7d060..afca968a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1951,6 +1951,31 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk9+</id>
+      <activation>
+        <jdk>[1.9,)</jdk>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>com.webcohesion.enunciate</groupId>
+              <artifactId>enunciate-maven-plugin</artifactId>
+              <version>${enunciate.version}</version>
+              <dependencies>
+                <!-- needed for jdk 11 -->
+                <dependency>
+                  <groupId>javax.xml.bind</groupId>
+                  <artifactId>jaxb-api</artifactId>
+                  <version>2.3.1</version>
+                </dependency>
+              </dependencies>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
   </profiles>
 
   <repositories>

Reply via email to