Migrate to Jakarta EE. WIP.

Author: karelmaxa

openam-audit/openam-audit-configuration/src/main/java/org/forgerock/openam/audit/configuration/AuditServiceConfigurationProviderImpl.java

@@ -43,7 +43,7 @@
 import org.forgerock.openam.utils.JsonValueBuilder;
 import org.forgerock.openam.utils.RealmUtils;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.AccessController;

openam-audit/openam-audit-configuration/src/main/java/org/forgerock/openam/audit/events/handlers/CsvAuditEventHandlerFactory.java

@@ -32,7 +32,7 @@
 import org.forgerock.openam.audit.configuration.AuditEventHandlerConfiguration;
 import org.forgerock.openam.utils.StringUtils;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

openam-audit/openam-audit-context/pom.xml

@@ -43,12 +43,6 @@
             <artifactId>forgerock-audit-core</artifactId>
         </dependency>
 
-        <!-- XXX This can be removed when Commons switches to Jakarta as well -->
-        <dependency>
-            <groupId>jakarta.inject</groupId>
-            <artifactId>jakarta.inject-api</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
@@ -57,7 +51,7 @@
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
-            <classifier>no_aop</classifier>
+            <!-- <classifier>no_aop</classifier> -->
         </dependency>
 
         <dependency>

openam-audit/openam-audit-context/src/main/java/org/forgerock/openam/audit/context/AuditContextFilter.java

@@ -20,13 +20,13 @@
 import org.forgerock.http.header.TransactionIdHeader;
 import org.forgerock.services.TransactionId;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
 /**

openam-audit/openam-audit-context/src/test/java/org/forgerock/openam/audit/AuditContextFilterTest.java

@@ -38,9 +38,9 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Module;

openam-audit/openam-audit-core/src/main/java/org/forgerock/openam/audit/AMAccessAuditEventBuilder.java

@@ -29,7 +29,7 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.forgerock.audit.events.AccessAuditEventBuilder;
 import org.forgerock.http.MutableUri;

openam-audit/openam-audit-core/src/main/java/org/forgerock/openam/audit/AuditEventFactory.java

@@ -17,7 +17,7 @@
 
 import static org.forgerock.openam.utils.StringUtils.isNotBlank;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 /**
  * Factory for creation of AuditEvent builders.

openam-audit/openam-audit-core/src/main/java/org/forgerock/openam/audit/AuditEventPublisherImpl.java

@@ -31,8 +31,8 @@
 import org.forgerock.openam.audit.AuditConstants.EventName;
 import org.forgerock.services.context.RootContext;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 /**
  * Responsible for publishing locally created audit events to the AuditService.

openam-audit/openam-audit-core/src/main/java/org/forgerock/openam/audit/AuditServiceProviderImpl.java

@@ -31,8 +31,8 @@
 import org.forgerock.util.thread.listener.ShutdownListener;
 import org.forgerock.util.thread.listener.ShutdownManager;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;

openam-audit/openam-audit-core/src/main/java/org/forgerock/openam/audit/HttpAccessAuditFilterFactory.java

@@ -17,7 +17,7 @@
 
 import static org.forgerock.openam.audit.AuditConstants.Component;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.Map;
 
 import org.forgerock.http.Filter;