Move to Jakarta EE 9 Namespace

pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.5</version>
+        <version>1.0.6</version>
     </parent>
 
     <groupId>org.glassfish</groupId>
-    <artifactId>javax.enterprise.concurrent</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <artifactId>jakarta.enterprise.concurrent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>org.glassfish.javax.enterprise.concurrent</name>
+    <name>org.glassfish.jakarta.enterprise.concurrent</name>
     <description>Compatible Implementation of Jakarta Concurrency</description>
     <url>https://projects.eclipse.org/projects/ee4j.cu</url>
 
@@ -58,13 +58,17 @@
             <name>Anthony Lai</name>
             <organization>Oracle</organization>
         </developer>
+        <developer>
+            <id>smillidge</id>
+            <name>Steve Millidge</name>
+            <organization>Payara</organization>
+        </developer>
     </developers>
 
     <organization>
         <name>Oracle Corporation</name>
         <url>http://www.oracle.com/</url>
     </organization>
-
     <issueManagement>
         <system>GitHub</system>
         <url>https://github.com/eclipse-ee4j/concurrency-ri/issues</url>
@@ -81,8 +85,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jakarta.enterprise.concurrent-api.version>1.1.2</jakarta.enterprise.concurrent-api.version>
-
+        <jakarta.enterprise.concurrent-api.version>2.0.0-RC1</jakarta.enterprise.concurrent-api.version>
     </properties>
 
 
@@ -93,19 +96,17 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>jakarta.platform</groupId>
-            <artifactId>jakarta.jakartaee-api</artifactId>
-            <version>8.0.0</version>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>jakarta.enterprise.concurrent</groupId>
             <artifactId>jakarta.enterprise.concurrent-api</artifactId>
             <version>${jakarta.enterprise.concurrent-api.version}</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>8.0.0</version>
+            <type>jar</type>
+        </dependency>
     </dependencies>
 
     <build>
@@ -114,12 +115,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.3.2</version>
+                    <version>3.8.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.3.4</version>
+                    <version>4.1.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -135,26 +136,22 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                    <useDefaultManifestFile>true</useDefaultManifestFile>
-                </configuration>
+                <version>3.1.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8.1</version>
+                <version>3.1.1</version>
                 <configuration>
                     <doctitle>Jakarta Concurrency Compatible Implementation ${project.version}</doctitle>
                     <bottom>
-<![CDATA[Copyright &#169; 1996-2013,
-    <a href="http://www.oracle.com">Oracle</a>
-    and/or its affiliates. All Rights Reserved.
+<![CDATA[Copyright (c) 2020 Eclipse Foundation.
     Use is subject to
     <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.
 ]]>
                     </bottom>
                     <excludePackageNames>org.glassfish.enterprise.concurrent.management</excludePackageNames>
+                    <source>1.8</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -168,7 +165,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.2</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>

src/main/java/org/glassfish/enterprise/concurrent/AbstractManagedExecutorService.java

@@ -21,8 +21,8 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.*;
-import javax.enterprise.concurrent.ContextService;
-import javax.enterprise.concurrent.ManagedExecutorService;
+import jakarta.enterprise.concurrent.ContextService;
+import jakarta.enterprise.concurrent.ManagedExecutorService;
 import org.glassfish.enterprise.concurrent.internal.ManagedFutureTask;
 import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;
 

src/main/java/org/glassfish/enterprise/concurrent/AbstractManagedExecutorServiceAdapter.java

@@ -18,7 +18,7 @@
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import javax.enterprise.concurrent.ManagedExecutorService;
+import jakarta.enterprise.concurrent.ManagedExecutorService;
 
 /**
  * Abstract base class for {@code ManagedExecutorService} and 

src/main/java/org/glassfish/enterprise/concurrent/AbstractManagedThread.java

@@ -16,7 +16,7 @@
 
 package org.glassfish.enterprise.concurrent;
 
-import javax.enterprise.concurrent.ManageableThread;
+import jakarta.enterprise.concurrent.ManageableThread;
 
 /**
  * Abstract base class for threads to be returned by 

src/main/java/org/glassfish/enterprise/concurrent/ContextServiceImpl.java

@@ -21,7 +21,7 @@
 import java.lang.reflect.Proxy;
 import java.util.Enumeration;
 import java.util.Map;
-import javax.enterprise.concurrent.ContextService;
+import jakarta.enterprise.concurrent.ContextService;
 import org.glassfish.enterprise.concurrent.internal.ContextProxyInvocationHandler;
 import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;
 import org.glassfish.enterprise.concurrent.spi.TransactionSetupProvider;

src/main/java/org/glassfish/enterprise/concurrent/ManagedExecutorCompletionService.java

@@ -17,7 +17,7 @@
 package org.glassfish.enterprise.concurrent;
 
 import java.util.concurrent.*;
-import javax.enterprise.concurrent.ManagedTaskListener;
+import jakarta.enterprise.concurrent.ManagedTaskListener;
 import org.glassfish.enterprise.concurrent.internal.ManagedFutureTask;
 import org.glassfish.enterprise.concurrent.internal.TaskDoneCallback;
 

src/main/java/org/glassfish/enterprise/concurrent/ManagedExecutorServiceAdapter.java

@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.*;
-import javax.enterprise.concurrent.ManagedExecutorService;
+import jakarta.enterprise.concurrent.ManagedExecutorService;
 
 /**
  * The ManagedExecutorService instance to be handed to the

src/main/java/org/glassfish/enterprise/concurrent/ManagedExecutorServiceImpl.java

@@ -23,7 +23,7 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.TimeUnit;
-import javax.enterprise.concurrent.ManagedExecutorService;
+import jakarta.enterprise.concurrent.ManagedExecutorService;
 import org.glassfish.enterprise.concurrent.internal.ManagedFutureTask;
 import org.glassfish.enterprise.concurrent.internal.ManagedThreadPoolExecutor;
 

src/main/java/org/glassfish/enterprise/concurrent/ManagedScheduledExecutorServiceAdapter.java

@@ -19,8 +19,8 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.*;
-import javax.enterprise.concurrent.ManagedScheduledExecutorService;
-import javax.enterprise.concurrent.Trigger;
+import jakarta.enterprise.concurrent.ManagedScheduledExecutorService;
+import jakarta.enterprise.concurrent.Trigger;
 
 /**
  * The ManagedScheduledExecutorService instance to be handed to the

src/main/java/org/glassfish/enterprise/concurrent/ManagedScheduledExecutorServiceImpl.java

@@ -17,9 +17,9 @@
 package org.glassfish.enterprise.concurrent;
 
 import java.util.concurrent.*;
-import javax.enterprise.concurrent.ManagedExecutorService;
-import javax.enterprise.concurrent.ManagedScheduledExecutorService;
-import javax.enterprise.concurrent.Trigger;
+import jakarta.enterprise.concurrent.ManagedExecutorService;
+import jakarta.enterprise.concurrent.ManagedScheduledExecutorService;
+import jakarta.enterprise.concurrent.Trigger;
 import org.glassfish.enterprise.concurrent.internal.ManagedFutureTask;
 import org.glassfish.enterprise.concurrent.internal.ManagedScheduledThreadPoolExecutor;
 

src/main/java/org/glassfish/enterprise/concurrent/ManagedThreadFactoryImpl.java

@@ -27,7 +27,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.enterprise.concurrent.ManagedThreadFactory;
+import jakarta.enterprise.concurrent.ManagedThreadFactory;
 import org.glassfish.enterprise.concurrent.internal.ManagedFutureTask;
 import org.glassfish.enterprise.concurrent.internal.ThreadExpiredException;
 import org.glassfish.enterprise.concurrent.spi.ContextHandle;

src/main/java/org/glassfish/enterprise/concurrent/internal/ContextProxyInvocationHandler.java

@@ -21,8 +21,8 @@
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
-import javax.enterprise.concurrent.ContextService;
-import javax.enterprise.concurrent.ManagedTask;
+import jakarta.enterprise.concurrent.ContextService;
+import jakarta.enterprise.concurrent.ManagedTask;
 import org.glassfish.enterprise.concurrent.ContextServiceImpl;
 import org.glassfish.enterprise.concurrent.spi.ContextHandle;
 import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;

src/main/java/org/glassfish/enterprise/concurrent/internal/ManagedFutureTask.java

@@ -21,10 +21,10 @@
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
-import javax.enterprise.concurrent.AbortedException;
-import javax.enterprise.concurrent.ContextService;
-import javax.enterprise.concurrent.ManagedTask;
-import javax.enterprise.concurrent.ManagedTaskListener;
+import jakarta.enterprise.concurrent.AbortedException;
+import jakarta.enterprise.concurrent.ContextService;
+import jakarta.enterprise.concurrent.ManagedTask;
+import jakarta.enterprise.concurrent.ManagedTaskListener;
 import org.glassfish.enterprise.concurrent.AbstractManagedExecutorService;
 import org.glassfish.enterprise.concurrent.spi.ContextHandle;
 import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;

src/main/java/org/glassfish/enterprise/concurrent/internal/ManagedScheduledThreadPoolExecutor.java

@@ -30,9 +30,9 @@
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReentrantLock;
-import javax.enterprise.concurrent.LastExecution;
-import javax.enterprise.concurrent.SkippedException;
-import javax.enterprise.concurrent.Trigger;
+import jakarta.enterprise.concurrent.LastExecution;
+import jakarta.enterprise.concurrent.SkippedException;
+import jakarta.enterprise.concurrent.Trigger;
 import org.glassfish.enterprise.concurrent.AbstractManagedExecutorService;
 import org.glassfish.enterprise.concurrent.AbstractManagedThread;
 

src/main/java/org/glassfish/enterprise/concurrent/internal/Util.java

@@ -17,7 +17,7 @@
 package org.glassfish.enterprise.concurrent.internal;
 
 import java.util.Map;
-import javax.enterprise.concurrent.ManagedTask;
+import jakarta.enterprise.concurrent.ManagedTask;
 
 
 public class Util {