Support JakartaEE 10

trellis-ldp · Oct 4, 2023 · a65a5d8 · a65a5d8
1 parent 618cf30
commit a65a5d8
Show file tree

Hide file tree

Showing 182 changed files with 926 additions and 927 deletions.
diff --git a/auth/jwt/pom.xml b/auth/jwt/pom.xml
@@ -134,6 +134,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>
+              --add-modules jakarta.el
               --add-opens java.base/java.lang=ALL-UNNAMED
           </argLine>
         </configuration>

diff --git a/auth/jwt/src/main/java/module-info.java b/auth/jwt/src/main/java/module-info.java
@@ -16,9 +16,10 @@
 module org.trellisldp.jwt {
     exports org.trellisldp.jwt;
 
+    requires jakarta.cdi;
     requires jakarta.inject;
-    requires java.ws.rs;
-    requires java.annotation;
+    requires jakarta.ws.rs;
+    requires jakarta.annotation;
     requires microprofile.config.api;
     requires microprofile.jwt.auth.api;
     requires org.slf4j;

diff --git a/auth/jwt/src/main/java/org/trellisldp/jwt/JwtAuthFilter.java b/auth/jwt/src/main/java/org/trellisldp/jwt/JwtAuthFilter.java
@@ -15,19 +15,19 @@
  */
 package org.trellisldp.jwt;
 
-import static javax.ws.rs.Priorities.AUTHENTICATION;
+import static jakarta.ws.rs.Priorities.AUTHENTICATION;
 import static org.eclipse.microprofile.config.ConfigProvider.getConfig;
 import static org.slf4j.LoggerFactory.getLogger;
 
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.ext.Provider;
+
 import java.io.IOException;
 import java.util.Set;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.ext.Provider;
-
 import org.eclipse.microprofile.jwt.JsonWebToken;
 import org.slf4j.Logger;
 

diff --git a/auth/jwt/src/main/java/org/trellisldp/jwt/WebIdSecurityContext.java b/auth/jwt/src/main/java/org/trellisldp/jwt/WebIdSecurityContext.java
@@ -15,11 +15,11 @@
  */
 package org.trellisldp.jwt;
 
+import jakarta.ws.rs.core.SecurityContext;
+
 import java.security.Principal;
 import java.util.Set;
 
-import javax.ws.rs.core.SecurityContext;
-
 import org.eclipse.microprofile.jwt.JsonWebToken;
 import org.trellisldp.common.TrellisRoles;
 

diff --git a/auth/jwt/src/main/resources/META-INF/beans.xml b/auth/jwt/src/main/resources/META-INF/beans.xml
@@ -3,5 +3,5 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
                            http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-       version="1.1" bean-discovery-mode="all">
+       version="1.1" bean-discovery-mode="annotated">
 </beans>
diff --git a/auth/jwt/src/test/java/org/trellisldp/jwt/JwtAuthFilterTest.java b/auth/jwt/src/test/java/org/trellisldp/jwt/JwtAuthFilterTest.java
@@ -21,11 +21,11 @@
 import io.smallrye.jwt.auth.cdi.PrincipalProducer;
 import io.smallrye.jwt.auth.principal.DefaultJWTCallerPrincipal;
 
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.core.SecurityContext;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.core.SecurityContext;
 
 import org.jboss.weld.junit5.WeldInitiator;
 import org.jboss.weld.junit5.WeldJunit5Extension;

diff --git a/auth/jwt/src/test/java/org/trellisldp/jwt/WebIdSecurityContextTest.java b/auth/jwt/src/test/java/org/trellisldp/jwt/WebIdSecurityContextTest.java
@@ -22,9 +22,9 @@
 
 import io.smallrye.jwt.auth.principal.DefaultJWTCallerPrincipal;
 
-import java.util.List;
+import jakarta.ws.rs.core.SecurityContext;
 
-import javax.ws.rs.core.SecurityContext;
+import java.util.List;
 
 import org.eclipse.microprofile.jwt.JsonWebToken;
 import org.jose4j.jwt.JwtClaims;

diff --git a/auth/webac/src/main/java/module-info.java b/auth/webac/src/main/java/module-info.java
@@ -26,11 +26,11 @@
     requires org.apache.jena.commonsrdf;
     requires org.slf4j;
 
-    requires jakarta.enterprise.cdi.api;
+    requires jakarta.cdi;
     requires jakarta.inject;
-    requires java.annotation;
-    requires java.xml.bind;
-    requires java.ws.rs;
+    requires jakarta.annotation;
+    requires jakarta.xml.bind;
+    requires jakarta.ws.rs;
     requires microprofile.config.api;
     requires microprofile.metrics.api;
 

diff --git a/auth/webac/src/main/java/org/trellisldp/webac/WebAcFilter.java b/auth/webac/src/main/java/org/trellisldp/webac/WebAcFilter.java
@@ -15,18 +15,18 @@
  */
 package org.trellisldp.webac;
 
+import static jakarta.ws.rs.HttpMethod.DELETE;
+import static jakarta.ws.rs.Priorities.AUTHORIZATION;
+import static jakarta.ws.rs.core.HttpHeaders.LINK;
+import static jakarta.ws.rs.core.Link.fromUri;
+import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL;
+import static jakarta.ws.rs.core.UriBuilder.fromPath;
 import static java.util.Arrays.asList;
 import static java.util.Arrays.stream;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static java.util.function.Predicate.isEqual;
 import static java.util.stream.Collectors.toList;
-import static javax.ws.rs.HttpMethod.DELETE;
-import static javax.ws.rs.Priorities.AUTHORIZATION;
-import static javax.ws.rs.core.HttpHeaders.LINK;
-import static javax.ws.rs.core.Link.fromUri;
-import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL;
-import static javax.ws.rs.core.UriBuilder.fromPath;
 import static org.eclipse.microprofile.config.ConfigProvider.getConfig;
 import static org.slf4j.LoggerFactory.getLogger;
 import static org.trellisldp.api.TrellisUtils.TRELLIS_DATA_PREFIX;
@@ -38,21 +38,21 @@
 import static org.trellisldp.vocabulary.Trellis.PreferAudit;
 import static org.trellisldp.vocabulary.Trellis.effectiveAcl;
 
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotAuthorizedException;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.core.Link;
+import jakarta.ws.rs.ext.Provider;
+
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.NotAuthorizedException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.Link;
-import javax.ws.rs.ext.Provider;
-
 import org.apache.commons.rdf.api.IRI;
 import org.apache.commons.rdf.api.RDF;
 import org.eclipse.microprofile.config.Config;

diff --git a/auth/webac/src/main/java/org/trellisldp/webac/WebAcService.java b/auth/webac/src/main/java/org/trellisldp/webac/WebAcService.java
@@ -37,6 +37,10 @@
 import static org.trellisldp.api.TrellisUtils.getContainer;
 import static org.trellisldp.api.TrellisUtils.toGraph;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collections;
@@ -50,10 +54,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
 import org.apache.commons.rdf.api.Dataset;
 import org.apache.commons.rdf.api.Graph;
 import org.apache.commons.rdf.api.IRI;
@@ -367,7 +367,7 @@ public AuthorizedModes get(final String key, final Function<String, AuthorizedMo
     @java.lang.annotation.Documented
     @java.lang.annotation.Retention(RUNTIME)
     @java.lang.annotation.Target({TYPE, METHOD, FIELD, PARAMETER})
-    @javax.inject.Qualifier
+    @jakarta.inject.Qualifier
     public @interface TrellisAuthorizationCache { }
 
 

diff --git a/auth/webac/src/main/resources/META-INF/beans.xml b/auth/webac/src/main/resources/META-INF/beans.xml
@@ -3,5 +3,5 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
                            http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-       version="1.1" bean-discovery-mode="all">
+       version="1.1" bean-discovery-mode="annotated">
 </beans>
diff --git a/auth/webac/src/test/java/org/trellisldp/webac/WebAcFilterTest.java b/auth/webac/src/test/java/org/trellisldp/webac/WebAcFilterTest.java
@@ -15,33 +15,33 @@
  */
 package org.trellisldp.webac;
 
+import static jakarta.ws.rs.HttpMethod.DELETE;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.OK;
 import static java.net.URI.create;
 import static java.util.Arrays.asList;
 import static java.util.Collections.*;
-import static javax.ws.rs.HttpMethod.DELETE;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static javax.ws.rs.core.Response.Status.OK;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 import static org.trellisldp.api.TrellisUtils.TRELLIS_DATA_PREFIX;
 import static org.trellisldp.common.HttpConstants.PREFER;
 
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotAuthorizedException;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.core.Link;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.SecurityContext;
+import jakarta.ws.rs.core.UriInfo;
+
 import java.security.Principal;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.NotAuthorizedException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.core.Link;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.UriInfo;
-
 import org.apache.commons.rdf.api.IRI;
 import org.apache.commons.rdf.api.RDF;
 import org.junit.jupiter.api.AfterAll;

diff --git a/buildtools/src/main/resources/checkstyle/checkstyle.xml b/buildtools/src/main/resources/checkstyle/checkstyle.xml
@@ -54,7 +54,7 @@
       <property name="sortStaticImportsAlphabetically" value="true"/>
       <property name="tokens" value="STATIC_IMPORT, IMPORT"/>
       <property name="separated" value="true"/>
-      <property name="groups" value="com,io,java,javax,org"/>
+      <property name="groups" value="com,io,jakarta,java,javax,org"/>
     </module>
 
     <module name="ModifierOrder">

diff --git a/components/app/pom.xml b/components/app/pom.xml
@@ -141,6 +141,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>
+              --add-modules jakarta.el
               --add-opens java.base/java.lang=ALL-UNNAMED
           </argLine>
         </configuration>

diff --git a/components/app/src/main/java/module-info.java b/components/app/src/main/java/module-info.java
@@ -21,7 +21,7 @@
     requires org.trellisldp.vocabulary;
 
     requires jakarta.inject;
-    requires jakarta.enterprise.cdi.api;
+    requires jakarta.cdi;
 
     requires org.slf4j;
 

diff --git a/components/app/src/main/java/org/trellisldp/app/BaseServiceBundler.java b/components/app/src/main/java/org/trellisldp/app/BaseServiceBundler.java
@@ -15,8 +15,8 @@
  */
 package org.trellisldp.app;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.trellisldp.api.*;
 import org.trellisldp.common.*;

diff --git a/components/app/src/main/resources/META-INF/beans.xml b/components/app/src/main/resources/META-INF/beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" version="1.1"
-  bean-discovery-mode="all">
+  bean-discovery-mode="annotated">
 </beans>
 
diff --git a/components/app/src/test/java/org/trellisldp/app/CDIConstraintServices.java b/components/app/src/test/java/org/trellisldp/app/CDIConstraintServices.java
@@ -15,11 +15,11 @@
  */
 package org.trellisldp.app;
 
-import java.util.Iterator;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import java.util.Iterator;
 
 import org.trellisldp.api.ConstraintService;
 

diff --git a/components/app/src/test/java/org/trellisldp/app/CDIServiceBundlerTest.java b/components/app/src/test/java/org/trellisldp/app/CDIServiceBundlerTest.java
@@ -20,7 +20,7 @@
 
 import io.smallrye.config.inject.ConfigProducer;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.jboss.weld.junit5.WeldInitiator;
 import org.jboss.weld.junit5.WeldJunit5Extension;

diff --git a/components/app/src/test/java/org/trellisldp/app/TestServices.java b/components/app/src/test/java/org/trellisldp/app/TestServices.java
@@ -15,8 +15,8 @@
  */
 package org.trellisldp.app;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 
 import org.trellisldp.api.*;
 

diff --git a/components/audit/src/main/java/module-info.java b/components/audit/src/main/java/module-info.java
@@ -19,7 +19,7 @@
     requires org.trellisldp.api;
     requires org.trellisldp.vocabulary;
 
-    requires jakarta.enterprise.cdi.api;
+    requires jakarta.cdi;
     requires org.apache.commons.rdf.api;
 
     provides org.trellisldp.api.AuditService

diff --git a/components/audit/src/main/java/org/trellisldp/audit/DefaultAuditService.java b/components/audit/src/main/java/org/trellisldp/audit/DefaultAuditService.java
@@ -19,11 +19,11 @@
 import static org.trellisldp.vocabulary.RDF.type;
 import static org.trellisldp.vocabulary.Trellis.PreferAudit;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.apache.commons.rdf.api.BlankNode;
 import org.apache.commons.rdf.api.IRI;
 import org.apache.commons.rdf.api.Quad;
@@ -42,7 +42,7 @@
  * <p>This class makes use of the {@link PROV} vocabulary and {@link BlankNode}
  * objects in a {@code http://www.trellisldp.org/ns/trellis#PreferAudit} named
  * graph.
- * 
+ *
  * @author acoburn
  */
 @ApplicationScoped

diff --git a/components/audit/src/main/resources/META-INF/beans.xml b/components/audit/src/main/resources/META-INF/beans.xml
@@ -3,5 +3,5 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
                            http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-       version="1.1" bean-discovery-mode="all">
+       version="1.1" bean-discovery-mode="annotated">
 </beans>
diff --git a/components/cdi/pom.xml b/components/cdi/pom.xml
@@ -94,6 +94,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>
+              --add-modules jakarta.el
               --add-opens java.base/java.lang=ALL-UNNAMED
           </argLine>
         </configuration>

diff --git a/components/cdi/src/main/java/module-info.java b/components/cdi/src/main/java/module-info.java
@@ -20,7 +20,7 @@
     requires org.trellisldp.app;
 
     requires jakarta.inject;
-    requires jakarta.enterprise.cdi.api;
+    requires jakarta.cdi;
 
     opens org.trellisldp.cdi;
 }