Merge pull request #375 from boozallen/354-pdp-jdk17

[#354] Modified PDP to build with Java 17
boozallen · Oct 1, 2024 · 2642dfb · 2642dfb
2 parents febce13 + cef4ff1
commit 2642dfb
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 33 deletions.
diff --git a/extensions/extensions-docker/aissemble-quarkus/src/main/resources/docker/Dockerfile b/extensions/extensions-docker/aissemble-quarkus/src/main/resources/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Script for creating base Quarkus application Docker image
-FROM registry.access.redhat.com/ubi9/openjdk-11-runtime:1.20
+FROM registry.access.redhat.com/ubi9/openjdk-17-runtime:1.20
 
 LABEL org.opencontainers.image.source="https://github.com/boozallen/aissemble"
 

diff --git a/extensions/extensions-security/extensions-authzforce-attribute/pom.xml b/extensions/extensions-security/extensions-authzforce-attribute/pom.xml
@@ -16,9 +16,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.13.2</version>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
+                <version>4.0.0</version>
                 <configuration>
                     <debug>false</debug>
                     <strict>false</strict>

diff --git a/extensions/extensions-security/extensions-authzforce-attribute/src/main/jaxb/bindings.xjb b/extensions/extensions-security/extensions-authzforce-attribute/src/main/jaxb/bindings.xjb
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<jaxb:bindings xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" 
 	xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-	jaxb:extensionBindingPrefixes="xjc" jaxb:version="2.1">
+	jaxb:extensionBindingPrefixes="xjc" jaxb:version="3.0">
 	<jaxb:globalBindings generateMixedExtensions="true" fixedAttributeAsConstantProperty="true">
 		<xjc:simple />
 	</jaxb:globalBindings>

diff --git a/extensions/extensions-security/extensions-authzforce-attribute/src/main/jaxb/catalog.xml b/extensions/extensions-security/extensions-authzforce-attribute/src/main/jaxb/catalog.xml
@@ -12,11 +12,11 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
 	<!-- For Maven JAXB plugin -->
 	<system systemId="http://www.w3.org/2001/xml.xsd"
-		uri="maven:org.ow2.authzforce:authzforce-ce-xmlns-model:jar::7.2.0!/xml.xsd" />
+		uri="maven:org.ow2.authzforce:authzforce-ce-xmlns-model:jar::9.1.0!/xml.xsd" />
 	<public publicId="http://authzforce.github.io/xmlns/pdp/ext/3"
-		uri="maven:org.ow2.authzforce:authzforce-ce-pdp-ext-model:jar::7.2.0!/pdp-ext-base.xsd" />
+		uri="maven:org.ow2.authzforce:authzforce-ce-pdp-ext-model:jar::9.1.0!/pdp-ext-base.xsd" />
 	<public
 		publicId="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17"
-		uri="maven:org.ow2.authzforce:authzforce-ce-xacml-model:jar::7.2.0!/xacml-core-v3-schema-wd-17.xsd" />
+		uri="maven:org.ow2.authzforce:authzforce-ce-xacml-model:jar::9.1.0!/xacml-core-v3-schema-wd-17.xsd" />
 
 </catalog>
diff --git a/extensions/extensions-security/extensions-authzforce/pom.xml b/extensions/extensions-security/extensions-authzforce/pom.xml
@@ -90,27 +90,6 @@
             <artifactId>slf4j-api</artifactId>
             <version>${version.slf4j}</version>
         </dependency>
-
-        <!-- TODO: Remove on upgrade to Java 17/authzforce-ce-core-pdp-engine 21.0.1 -->
-        <!-- We were previously using the javax JAXB packages, but they've been phased out/migrated to Jakarta in newer
-        versions of our libraries. Unfortunately, the version of authzforce that switches to Jakarta is not compatible
-        with Java 11 -->
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-
         <!-- TEST dependencies -->
         <dependency>
             <groupId>io.cucumber</groupId>

diff --git a/extensions/extensions-security/pom.xml b/extensions/extensions-security/pom.xml
@@ -15,9 +15,9 @@
     <description>Contains the implementation modules used for security</description>
 
     <properties>
-        <version.authzforce>20.1.0</version.authzforce>
-        <version.authzforce.api>21.2.0</version.authzforce.api>
-        <version.authzforce.model>8.2.1</version.authzforce.model>
+        <version.authzforce>21.0.1</version.authzforce>
+        <version.authzforce.api>22.0.0</version.authzforce.api>
+        <version.authzforce.model>9.0.0</version.authzforce.model>
     </properties>
 
     <modules>