From 4e15d4fd6f458ac29b4dc928b538e2d23e2885f1 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sat, 6 Aug 2022 11:30:06 +1000
Subject: [MRM-2031] Switch to jdk 11

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 .../archiva-base/archiva-policies/pom.xml          | 36 ++++++++--------------
 1 file changed, 13 insertions(+), 23 deletions(-)

(limited to 'archiva-modules/archiva-base/archiva-policies')

diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index 9dc186ec9..41e004056 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -75,6 +75,19 @@
       <scope>runtime</scope>
     </dependency>
 
+
+    <dependency>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <!-- Test scope -->
 
     <dependency>
@@ -137,27 +150,4 @@
     </pluginManagement>
   </build>
 
-  <profiles>
-    <profile>
-      <id>jdk9+</id>
-      <activation>
-        <jdk>[1.9,)</jdk>
-      </activation>
-      <dependencies>
-        <!-- Needed for JDK >= 9 -->
-        <dependency>
-          <groupId>jakarta.annotation</groupId>
-          <artifactId>jakarta.annotation-api</artifactId>
-          <scope>test</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>jakarta.xml.bind</groupId>
-          <artifactId>jakarta.xml.bind-api</artifactId>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
 </project>
-- 
cgit v1.2.3