You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2022/03/19 19:07:43 UTC
[directory-fortress-core] branch master updated: FC-309 - Dependency upgrades
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git
The following commit(s) were added to refs/heads/master by this push:
new f209023 FC-309 - Dependency upgrades
f209023 is described below
commit f209023d46231f4688f0f7a269fd1462bc923df1
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Sat Mar 19 14:07:38 2022 -0500
FC-309 - Dependency upgrades
---
pom.xml | 15 +++++++++++----
.../org/apache/directory/fortress/core/model/Address.java | 8 ++++----
.../apache/directory/fortress/core/model/AdminRole.java | 8 ++++----
.../fortress/core/model/AdminRoleRelationship.java | 8 ++++----
.../org/apache/directory/fortress/core/model/AuthZ.java | 8 ++++----
.../org/apache/directory/fortress/core/model/Bind.java | 8 ++++----
.../directory/fortress/core/model/Configuration.java | 8 ++++----
.../apache/directory/fortress/core/model/FortEntity.java | 12 ++++++------
.../apache/directory/fortress/core/model/FortRequest.java | 2 +-
.../directory/fortress/core/model/FortResponse.java | 2 +-
.../org/apache/directory/fortress/core/model/Group.java | 2 +-
.../org/apache/directory/fortress/core/model/Mod.java | 8 ++++----
.../directory/fortress/core/model/ObjectFactory.java | 6 +++---
.../org/apache/directory/fortress/core/model/OrgUnit.java | 10 +++++-----
.../fortress/core/model/OrgUnitRelationship.java | 8 ++++----
.../apache/directory/fortress/core/model/PermGrant.java | 8 ++++----
.../org/apache/directory/fortress/core/model/PermObj.java | 10 +++++-----
.../apache/directory/fortress/core/model/Permission.java | 10 +++++-----
.../fortress/core/model/PermissionAttribute.java | 10 +++++-----
.../fortress/core/model/PermissionAttributeSet.java | 10 +++++-----
.../org/apache/directory/fortress/core/model/Props.java | 8 ++++----
.../apache/directory/fortress/core/model/PwPolicy.java | 8 ++++----
.../org/apache/directory/fortress/core/model/Role.java | 12 ++++++------
.../directory/fortress/core/model/RoleConstraint.java | 12 ++++++------
.../apache/directory/fortress/core/model/RolePerm.java | 8 ++++----
.../directory/fortress/core/model/RoleRelationship.java | 8 ++++----
.../org/apache/directory/fortress/core/model/SDSet.java | 10 +++++-----
.../org/apache/directory/fortress/core/model/Session.java | 8 ++++----
.../org/apache/directory/fortress/core/model/User.java | 10 +++++-----
.../directory/fortress/core/model/UserAdminRole.java | 8 ++++----
.../apache/directory/fortress/core/model/UserAudit.java | 8 ++++----
.../apache/directory/fortress/core/model/UserRole.java | 10 +++++-----
.../org/apache/directory/fortress/core/model/Warning.java | 10 +++++-----
.../directory/fortress/core/rest/CachedJaxbContext.java | 8 ++++----
.../directory/fortress/core/rest/JAXBCachedEntry.java | 4 ++--
.../apache/directory/fortress/core/rest/RestUtils.java | 8 ++++----
36 files changed, 154 insertions(+), 147 deletions(-)
diff --git a/pom.xml b/pom.xml
index ec87ee0..86a2b5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
<version.jasypt>1.9.3</version.jasypt>
<version.javaee.api>8.0.1</version.javaee.api>
<version.jaxb.api>2.4.0-b180830.0359</version.jaxb.api>
- <version.jaxb.core>3.0.2</version.jaxb.core>
+ <version.jaxb.core>3.0.1</version.jaxb.core>
<version.jaxb.impl>3.0.2</version.jaxb.impl>
<version.jgrapht-core>1.4.0</version.jgrapht-core>
<version.jmeter.core>5.4.3</version.jmeter.core>
@@ -725,9 +725,16 @@
</activation>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${version.jaxb.api}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${version.jaxb.core}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${version.jaxb.impl}</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Address.java b/src/main/java/org/apache/directory/fortress/core/model/Address.java
index d04b355..1c4f96d 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/Address.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Address.java
@@ -24,10 +24,10 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
index f0ed41a..04d5f13 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
@@ -23,10 +23,10 @@ package org.apache.directory.fortress.core.model;
import java.util.Set;
import java.util.TreeSet;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.commons.lang.StringUtils;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AdminRoleRelationship.java b/src/main/java/org/apache/directory/fortress/core/model/AdminRoleRelationship.java
index 4433c6f..13d1c7a 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AdminRoleRelationship.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AdminRoleRelationship.java
@@ -21,10 +21,10 @@ package org.apache.directory.fortress.core.model;
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
* This entity is used by Fortress Rest to communicate parent and child {@link AdminRole} information to the server.
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AuthZ.java b/src/main/java/org/apache/directory/fortress/core/model/AuthZ.java
index d204910..67a5ec0 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AuthZ.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AuthZ.java
@@ -20,10 +20,10 @@
package org.apache.directory.fortress.core.model;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import java.io.Serializable;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Bind.java b/src/main/java/org/apache/directory/fortress/core/model/Bind.java
index 14a7e5f..47dc870 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Bind.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Bind.java
@@ -20,10 +20,10 @@
package org.apache.directory.fortress.core.model;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import java.io.Serializable;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Configuration.java b/src/main/java/org/apache/directory/fortress/core/model/Configuration.java
index b3c548b..5efc27b 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/Configuration.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Configuration.java
@@ -20,10 +20,10 @@
package org.apache.directory.fortress.core.model;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import java.util.Enumeration;
import java.util.List;
import java.util.Objects;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/FortEntity.java b/src/main/java/org/apache/directory/fortress/core/model/FortEntity.java
index 9c4d954..fff588d 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/FortEntity.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/FortEntity.java
@@ -22,12 +22,12 @@ package org.apache.directory.fortress.core.model;
import java.util.UUID;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/FortRequest.java b/src/main/java/org/apache/directory/fortress/core/model/FortRequest.java
index a8c3d7a..7ba5ea5 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/FortRequest.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/FortRequest.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core.model;
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
/**
* This class is used to pass request data to Fortress Rest server.
diff --git a/src/main/java/org/apache/directory/fortress/core/model/FortResponse.java b/src/main/java/org/apache/directory/fortress/core/model/FortResponse.java
index d3244ff..b409025 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/FortResponse.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/FortResponse.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core.model;
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
import org.apache.directory.fortress.core.GlobalErrIds;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Group.java b/src/main/java/org/apache/directory/fortress/core/model/Group.java
index 8d19e20..811319f 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Group.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Group.java
@@ -22,7 +22,7 @@ package org.apache.directory.fortress.core.model;
import org.apache.directory.fortress.core.util.PropUtil;
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Enumeration;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Mod.java b/src/main/java/org/apache/directory/fortress/core/model/Mod.java
index a122a4d..cbf2f9b 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Mod.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Mod.java
@@ -20,10 +20,10 @@
package org.apache.directory.fortress.core.model;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import java.io.Serializable;
import java.util.List;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/ObjectFactory.java b/src/main/java/org/apache/directory/fortress/core/model/ObjectFactory.java
index 1ed5b5c..cde50a6 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/ObjectFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/ObjectFactory.java
@@ -20,9 +20,9 @@
package org.apache.directory.fortress.core.model;
-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/apache/directory/fortress/core/model/OrgUnit.java b/src/main/java/org/apache/directory/fortress/core/model/OrgUnit.java
index 33e2187..f9075bf 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/OrgUnit.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/OrgUnit.java
@@ -25,11 +25,11 @@ import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
diff --git a/src/main/java/org/apache/directory/fortress/core/model/OrgUnitRelationship.java b/src/main/java/org/apache/directory/fortress/core/model/OrgUnitRelationship.java
index 38e1ac9..f42c1c1 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/OrgUnitRelationship.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/OrgUnitRelationship.java
@@ -21,10 +21,10 @@ package org.apache.directory.fortress.core.model;
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PermGrant.java b/src/main/java/org/apache/directory/fortress/core/model/PermGrant.java
index 24f8ca6..6ba64b3 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/PermGrant.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PermGrant.java
@@ -21,10 +21,10 @@ package org.apache.directory.fortress.core.model;
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
* This entity is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to add {@link Permission} grants to
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PermObj.java b/src/main/java/org/apache/directory/fortress/core/model/PermObj.java
index fee7cdd..0699ca0 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/PermObj.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PermObj.java
@@ -26,11 +26,11 @@ import java.util.List;
import java.util.Properties;
import java.util.UUID;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
/**
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Permission.java b/src/main/java/org/apache/directory/fortress/core/model/Permission.java
index 87199dc..12f7d7b 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Permission.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Permission.java
@@ -29,11 +29,11 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.UUID;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.commons.lang.StringUtils;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java b/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
index 9b044bb..6b936c6 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
@@ -24,11 +24,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
/**
* All entities (User, Role, Permission, Policy, SDSet, etc...) are used to carry data between Fortress's
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PermissionAttributeSet.java b/src/main/java/org/apache/directory/fortress/core/model/PermissionAttributeSet.java
index 1019cd6..ba39b70 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/PermissionAttributeSet.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PermissionAttributeSet.java
@@ -24,11 +24,11 @@ import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
/**
* This a grouping of {@link org.apache.directory.fortress.core.model.PermissionAttribute}.
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Props.java b/src/main/java/org/apache/directory/fortress/core/model/Props.java
index abcdd51..53edcd4 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Props.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Props.java
@@ -20,10 +20,10 @@
package org.apache.directory.fortress.core.model;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PwPolicy.java b/src/main/java/org/apache/directory/fortress/core/model/PwPolicy.java
index e14e325..87ec506 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/PwPolicy.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PwPolicy.java
@@ -22,10 +22,10 @@ package org.apache.directory.fortress.core.model;
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
* This class contains the Password Policy entity which is used to pass directives into and out of ldap.<br>
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Role.java b/src/main/java/org/apache/directory/fortress/core/model/Role.java
index ea5b69e..3c7c10a 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Role.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Role.java
@@ -28,12 +28,12 @@ import java.util.Properties;
import java.util.Set;
import java.util.UUID;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
/**
diff --git a/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java b/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java
index 7e49855..14b8650 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java
@@ -24,12 +24,12 @@ import java.util.UUID;
import org.apache.directory.fortress.core.util.Config;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
/**
* The role constraint object holds non date time constraints on user to role relationships.
diff --git a/src/main/java/org/apache/directory/fortress/core/model/RolePerm.java b/src/main/java/org/apache/directory/fortress/core/model/RolePerm.java
index 8686e68..1dbe6fe 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/RolePerm.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/RolePerm.java
@@ -21,10 +21,10 @@ package org.apache.directory.fortress.core.model;
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
* This entity is used by Fortress Rest to communicate {@link org.apache.directory.fortress.core.model.Role}, {@link Permission} and {@link org.apache.directory.fortress.core.model.Session} information to the server for access control decisions.
diff --git a/src/main/java/org/apache/directory/fortress/core/model/RoleRelationship.java b/src/main/java/org/apache/directory/fortress/core/model/RoleRelationship.java
index d4bcc8f..75743ab 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/RoleRelationship.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/RoleRelationship.java
@@ -21,10 +21,10 @@ package org.apache.directory.fortress.core.model;
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
* This entity is used by Fortress Rest to communicate parent and child {@link org.apache.directory.fortress.core.model.Role} information to the server.
diff --git a/src/main/java/org/apache/directory/fortress/core/model/SDSet.java b/src/main/java/org/apache/directory/fortress/core/model/SDSet.java
index 7001a03..70a0251 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/SDSet.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/SDSet.java
@@ -20,11 +20,11 @@
package org.apache.directory.fortress.core.model;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import java.io.Serializable;
import java.util.HashSet;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Session.java b/src/main/java/org/apache/directory/fortress/core/model/Session.java
index 2e65f73..76723d3 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Session.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Session.java
@@ -19,10 +19,10 @@
*/
package org.apache.directory.fortress.core.model;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/User.java b/src/main/java/org/apache/directory/fortress/core/model/User.java
index 27eaab9..341a924 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/User.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/User.java
@@ -27,11 +27,11 @@ import java.util.List;
import java.util.Properties;
import java.util.UUID;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
/**
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
index 99819ec..a6e98c2 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
@@ -23,10 +23,10 @@ package org.apache.directory.fortress.core.model;
import java.util.Set;
import java.util.TreeSet;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.GlobalIds;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserAudit.java b/src/main/java/org/apache/directory/fortress/core/model/UserAudit.java
index 293c327..0febefe 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserAudit.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserAudit.java
@@ -20,10 +20,10 @@
package org.apache.directory.fortress.core.model;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import java.util.Date;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
index 8fa2c1f..a78ed9d 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
@@ -25,11 +25,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.util.Config;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Warning.java b/src/main/java/org/apache/directory/fortress/core/model/Warning.java
index 595df0e..c1f54dd 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/Warning.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Warning.java
@@ -20,11 +20,11 @@
package org.apache.directory.fortress.core.model;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import java.io.Serializable;
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/CachedJaxbContext.java b/src/main/java/org/apache/directory/fortress/core/rest/CachedJaxbContext.java
index 99016ea..8a7e694 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/CachedJaxbContext.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/CachedJaxbContext.java
@@ -21,10 +21,10 @@ package org.apache.directory.fortress.core.rest;
import java.util.Hashtable;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
/**
* This class contains a very simple caching mechanism for storing JAXBContext objects associated with Fortress XML
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/JAXBCachedEntry.java b/src/main/java/org/apache/directory/fortress/core/rest/JAXBCachedEntry.java
index 3e548a8..73d9228 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/JAXBCachedEntry.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/JAXBCachedEntry.java
@@ -19,8 +19,8 @@
*/
package org.apache.directory.fortress.core.rest;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
/**
* This class wraps JAXBContext and is used for simple caching mechanism during Fortress XML processing.
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java b/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
index db4e998..01eac73 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
@@ -29,10 +29,10 @@ import java.util.Properties;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.IOUtils;