BREAKING CHANGE: #13 Support Jakarta EE 10

* Update to java 11 * switch to jakarta xml bind * some dependency updates
tailorfastGmbH · Jul 12, 2023 · 3c662eb · 3c662eb
1 parent 99c77f4
commit 3c662eb
Show file tree

Hide file tree

Showing 82 changed files with 312 additions and 312 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,5 +1,5 @@
 pool:
-  vmImage: 'ubuntu-20.04'
+  vmImage: 'ubuntu-22.04'
 
 variables:
   - group: PGP
@@ -19,7 +19,7 @@ variables:
   - name: MAVEN_OPTS
     value: -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)
   - name: JDK_VERSION
-    value: '1.8'
+    value: '11'
   # Project-specific variables
   - name: projectName
     value: $(Build.DefinitionName)

diff --git a/pom.xml b/pom.xml
@@ -46,26 +46,26 @@
 	<properties>
 		<revision>0.0.0</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.compile.version>1.8</java.compile.version>
+		<java.compile.version>11</java.compile.version>
 
 		<reporting.findbugs.excludeFile.location>src/main/config/reporting/findbugs-excludes.xml</reporting.findbugs.excludeFile.location>
 		<reporting.checkstyle.excludeFile.location>src/main/config/reporting/checkstyle-suppressions.xml</reporting.checkstyle.excludeFile.location>
 
 		<!-- Dependencies versions -->
-		<jaxb.version>3.0.2</jaxb.version>
-		<slf4j.version>1.7.32</slf4j.version>
+		<jaxb.version>4.0.3</jaxb.version>
+		<slf4j.version>2.0.7</slf4j.version>
 
-		<testng.version>7.4.0</testng.version>
-		<junit.version>4.13.2</junit.version>
-		<xmlunit.version>1.6</xmlunit.version>
-		<logback.version>1.2.7</logback.version>
+		<testng.version>7.8.0</testng.version>
+		<xmlunit.version>2.9.1</xmlunit.version>
+		<logback.version>1.4.8</logback.version>
+		<jakarta.xml.bind.version>4.0.0</jakarta.xml.bind.version>
 
-		<bundle.plugin.version>5.1.2</bundle.plugin.version>
-		<compiler.plugin.version>3.8.1</compiler.plugin.version>
-		<javadoc.plugin.version>3.3.1</javadoc.plugin.version>
-		<source.plugin.version>3.2.1</source.plugin.version>
-		<surefire.plugin.version>2.22.2</surefire.plugin.version>
-		<release.plugin.version>2.5.3</release.plugin.version>
+		<bundle.plugin.version>5.1.8</bundle.plugin.version>
+		<compiler.plugin.version>3.11.0</compiler.plugin.version>
+		<javadoc.plugin.version>3.5.0</javadoc.plugin.version>
+		<source.plugin.version>3.3.0</source.plugin.version>
+		<surefire.plugin.version>3.1.2</surefire.plugin.version>
+		<release.plugin.version>3.0.1</release.plugin.version>
 		<pgp.plugin.version>1.1</pgp.plugin.version>
 	</properties>
 
@@ -74,6 +74,12 @@
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
 			<version>${jaxb.version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>${jakarta.xml.bind.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -93,14 +99,8 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>xmlunit</groupId>
-			<artifactId>xmlunit</artifactId>
+			<groupId>org.xmlunit</groupId>
+			<artifactId>xmlunit-legacy</artifactId>
 			<version>${xmlunit.version}</version>
 			<scope>test</scope>
 		</dependency>
@@ -130,8 +130,7 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>${compiler.plugin.version}</version>
 				<configuration>
-					<source>${java.compile.version}</source>
-					<target>${java.compile.version}</target>
+					<release>${java.compile.version}</release>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -156,6 +155,7 @@
 				<version>${javadoc.plugin.version}</version>
 				<configuration>
 					<failOnError>false</failOnError>
+					<quiet>true</quiet>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/src/main/java/org/herasaf/xacml/core/context/RequestMarshaller.java b/src/main/java/org/herasaf/xacml/core/context/RequestMarshaller.java
@@ -23,12 +23,12 @@
 import java.io.Writer;
 import java.net.URL;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.PropertyException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.PropertyException;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLStreamReader;

diff --git a/src/main/java/org/herasaf/xacml/core/context/ResponseMarshaller.java b/src/main/java/org/herasaf/xacml/core/context/ResponseMarshaller.java
@@ -25,12 +25,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.PropertyException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.PropertyException;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLStreamReader;

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/ActionType.java b/src/main/java/org/herasaf/xacml/core/context/impl/ActionType.java
@@ -28,9 +28,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * <p>

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/AttributeType.java b/src/main/java/org/herasaf/xacml/core/context/impl/AttributeType.java
@@ -28,12 +28,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.herasaf.xacml.core.converter.DataTypeJAXBTypeAdapter;
 import org.herasaf.xacml.core.dataTypeAttribute.DataTypeAttribute;

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/AttributeValueType.java b/src/main/java/org/herasaf/xacml/core/context/impl/AttributeValueType.java
@@ -30,11 +30,11 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAnyAttribute;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
 
 /**

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/DecisionType.java b/src/main/java/org/herasaf/xacml/core/context/impl/DecisionType.java
@@ -24,10 +24,10 @@
 
 package org.herasaf.xacml.core.context.impl;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * <p>

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/EnvironmentType.java b/src/main/java/org/herasaf/xacml/core/context/impl/EnvironmentType.java
@@ -28,9 +28,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * <p>

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/MissingAttributeDetailType.java b/src/main/java/org/herasaf/xacml/core/context/impl/MissingAttributeDetailType.java
@@ -28,12 +28,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.herasaf.xacml.core.converter.DataTypeJAXBTypeAdapter;
 import org.herasaf.xacml.core.dataTypeAttribute.DataTypeAttribute;

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/ObjectFactory.java b/src/main/java/org/herasaf/xacml/core/context/impl/ObjectFactory.java
@@ -24,9 +24,9 @@
 
 package org.herasaf.xacml.core.context.impl;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
 /**

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/RequestType.java b/src/main/java/org/herasaf/xacml/core/context/impl/RequestType.java
@@ -28,9 +28,9 @@
 import org.herasaf.xacml.core.dataTypeAttribute.impl.DateTimeDataTypeAttribute;
 import org.herasaf.xacml.core.dataTypeAttribute.impl.TimeDataTypeAttribute;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import java.io.Serializable;
 import java.time.OffsetDateTime;

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/ResourceContentType.java b/src/main/java/org/herasaf/xacml/core/context/impl/ResourceContentType.java
@@ -30,11 +30,11 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAnyAttribute;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
 
 /**

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/ResourceType.java b/src/main/java/org/herasaf/xacml/core/context/impl/ResourceType.java
@@ -28,9 +28,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * <p>

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/ResponseType.java b/src/main/java/org/herasaf/xacml/core/context/impl/ResponseType.java
@@ -28,9 +28,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * <p>

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/ResultType.java b/src/main/java/org/herasaf/xacml/core/context/impl/ResultType.java
@@ -26,10 +26,10 @@
 
 import java.io.Serializable;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.herasaf.xacml.core.policy.impl.ObligationsType;
 

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/StatusCodeType.java b/src/main/java/org/herasaf/xacml/core/context/impl/StatusCodeType.java
@@ -26,11 +26,11 @@
 
 import java.io.Serializable;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * <p>

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/StatusDetailType.java b/src/main/java/org/herasaf/xacml/core/context/impl/StatusDetailType.java
@@ -28,10 +28,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * <p>

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/StatusType.java b/src/main/java/org/herasaf/xacml/core/context/impl/StatusType.java
@@ -26,9 +26,9 @@
 
 import java.io.Serializable;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * <p>

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/SubjectType.java b/src/main/java/org/herasaf/xacml/core/context/impl/SubjectType.java
@@ -28,11 +28,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * <p>

diff --git a/src/main/java/org/herasaf/xacml/core/context/impl/package-info.java b/src/main/java/org/herasaf/xacml/core/context/impl/package-info.java
@@ -22,6 +22,6 @@
 // Generated on: 2007.10.03 at 07:56:30 AM CEST 
 //
 
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlAccessorType(jakarta.xml.bind.annotation.XmlAccessType.FIELD)
 package org.herasaf.xacml.core.context.impl;