Change namespace to jakarta

pom.xml

@@ -10,7 +10,8 @@
     Licenses when the conditions for such availability set forth in the
     Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
     version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
+    https://www
+.gnu.org/software/classpath/license.html.
 
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
@@ -23,16 +24,16 @@
     <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-RC1</version>
     <packaging>jar</packaging>
     <name>org.glassfish.javax.enterprise.concurrent</name>
-    <description>Reference Implementation for JSR 236 - Concurrency Utilities for Java EE</description>
-    <url>http://java.net/projects/cu-javaee</url>
+    <description>Eclipse GlassFish Compatible Implementation of Jakarta Concurrency</description>
+    <url>https://projects.eclipse.org/projects/ee4j.cu</url>
 
      <licenses>
         <license>
@@ -58,11 +59,16 @@
             <name>Anthony Lai</name>
             <organization>Oracle</organization>
         </developer>
+        <developer>
+            <id>steve.millidge</id>
+            <name>Steve Millidge</name>
+            <organization>Payara</organization>
+        </developer>
     </developers>
 
     <organization>
-        <name>Oracle Corporation</name>
-        <url>http://www.oracle.com/</url>
+        <name>Eclipse Foundation</name>
+        <url>http://www.eclipse.org/</url>
     </organization>
 
     <issueManagement>
@@ -81,7 +87,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <javax.enterprise.concurrent-api.version>1.0</javax.enterprise.concurrent-api.version>
+        <jakarta.enterprise.concurrent-api.version>2.0.0-RC1</jakarta.enterprise.concurrent-api.version>
 
     </properties>
 
@@ -95,16 +101,16 @@
         </dependency>
 
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>8.0</version>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>8.0.0</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise.concurrent</groupId>
-            <artifactId>javax.enterprise.concurrent-api</artifactId>
-            <version>${javax.enterprise.concurrent-api.version}</version>
+            <groupId>jakarta.enterprise.concurrent</groupId>
+            <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+            <version>${jakarta.enterprise.concurrent-api.version}</version>
         </dependency>
     </dependencies>
 
@@ -145,9 +151,9 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.8.1</version>
                 <configuration>
-                    <doctitle>Concurrency Utilities for Java EE Reference Implementation${project.version}</doctitle>
+                    <doctitle>Concurrency Utilities for Jakarta EE Compatible Implementation ${project.version}</doctitle>
                     <bottom>
-<![CDATA[Copyright &#169; 1996-2013,
+<![CDATA[Copyright &#169; 1996-2020,
     <a href="http://www.oracle.com">Oracle</a>
     and/or its affiliates. All Rights Reserved.
     Use is subject to

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 {

src/main/java/org/glassfish/enterprise/concurrent/spi/ContextSetupProvider.java

@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 import java.util.Map;
-import javax.enterprise.concurrent.ContextService;
+import jakarta.enterprise.concurrent.ContextService;
 
 /**
  * To be implemented by application server for setting up proper execution

src/main/java/org/glassfish/enterprise/concurrent/spi/TransactionSetupProvider.java

@@ -17,8 +17,8 @@
 package org.glassfish.enterprise.concurrent.spi;
 
 import java.io.Serializable;
-import javax.enterprise.concurrent.ContextService;
-import javax.enterprise.concurrent.ManagedTask;
+import jakarta.enterprise.concurrent.ContextService;
+import jakarta.enterprise.concurrent.ManagedTask;
 
 /**
  * To be implemented by application server for performing proper transaction

src/test/java/org/glassfish/enterprise/concurrent/ContextServiceImplTest.java

@@ -24,7 +24,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Callable;
-import javax.enterprise.concurrent.ManagedTask;
+import jakarta.enterprise.concurrent.ManagedTask;
 import org.glassfish.enterprise.concurrent.test.ClassloaderContextSetupProvider;
 import org.glassfish.enterprise.concurrent.test.DummyTransactionSetupProvider;
 import org.glassfish.enterprise.concurrent.test.ManagedTaskListenerImpl;

src/test/java/org/glassfish/enterprise/concurrent/ManagedExecutorServiceAdapterTest.java

@@ -32,10 +32,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.enterprise.concurrent.AbortedException;
-import javax.enterprise.concurrent.ManagedExecutorService;
-import javax.enterprise.concurrent.ManagedExecutors;
-import javax.enterprise.concurrent.ManagedTaskListener;
+import jakarta.enterprise.concurrent.AbortedException;
+import jakarta.enterprise.concurrent.ManagedExecutorService;
+import jakarta.enterprise.concurrent.ManagedExecutors;
+import jakarta.enterprise.concurrent.ManagedTaskListener;
 import org.glassfish.enterprise.concurrent.AbstractManagedExecutorService.RejectPolicy;
 import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;
 import org.glassfish.enterprise.concurrent.test.BlockingRunnableImpl;

src/test/java/org/glassfish/enterprise/concurrent/ManagedExecutorServiceImplTest.java

@@ -27,7 +27,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.enterprise.concurrent.ManagedExecutorService;
+import jakarta.enterprise.concurrent.ManagedExecutorService;
 import org.glassfish.enterprise.concurrent.AbstractManagedExecutorService.RejectPolicy;
 import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;
 import org.glassfish.enterprise.concurrent.test.BlockingRunnableImpl;

src/test/java/org/glassfish/enterprise/concurrent/ManagedScheduledExecutorServiceAdapterTest.java

@@ -26,11 +26,11 @@
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.enterprise.concurrent.LastExecution;
-import javax.enterprise.concurrent.ManagedExecutorService;
-import javax.enterprise.concurrent.ManagedScheduledExecutorService;
-import javax.enterprise.concurrent.SkippedException;
-import javax.enterprise.concurrent.Trigger;
+import jakarta.enterprise.concurrent.LastExecution;
+import jakarta.enterprise.concurrent.ManagedExecutorService;
+import jakarta.enterprise.concurrent.ManagedScheduledExecutorService;
+import jakarta.enterprise.concurrent.SkippedException;
+import jakarta.enterprise.concurrent.Trigger;
 import org.glassfish.enterprise.concurrent.AbstractManagedExecutorService.RejectPolicy;
 import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;
 import org.glassfish.enterprise.concurrent.test.CallableImpl;

src/test/java/org/glassfish/enterprise/concurrent/ManagedScheduledExecutorServiceImplTest.java

@@ -17,7 +17,7 @@
 package org.glassfish.enterprise.concurrent;
 
 import java.util.concurrent.TimeUnit;
-import javax.enterprise.concurrent.ManagedExecutorService;
+import jakarta.enterprise.concurrent.ManagedExecutorService;
 import org.glassfish.enterprise.concurrent.AbstractManagedExecutorService.RejectPolicy;
 import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;
 import org.glassfish.enterprise.concurrent.test.TestContextService;

src/test/java/org/glassfish/enterprise/concurrent/ManagedThreadFactoryImplTest.java

@@ -16,7 +16,7 @@
 
 package org.glassfish.enterprise.concurrent;
 
-import javax.enterprise.concurrent.ManageableThread;
+import jakarta.enterprise.concurrent.ManageableThread;
 import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;
 import org.glassfish.enterprise.concurrent.test.ClassloaderContextSetupProvider;
 import org.glassfish.enterprise.concurrent.test.RunnableImpl;

src/test/java/org/glassfish/enterprise/concurrent/test/ClassloaderContextSetupProvider.java

@@ -17,7 +17,7 @@
 package org.glassfish.enterprise.concurrent.test;
 
 import java.util.Map;
-import javax.enterprise.concurrent.ContextService;
+import jakarta.enterprise.concurrent.ContextService;
 import org.glassfish.enterprise.concurrent.spi.ContextHandle;
 import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;
 

src/test/java/org/glassfish/enterprise/concurrent/test/ManagedBlockingRunnableTask.java

@@ -17,8 +17,8 @@
 package org.glassfish.enterprise.concurrent.test;
 
 import java.util.Map;
-import javax.enterprise.concurrent.ManagedTask;
-import javax.enterprise.concurrent.ManagedTaskListener;
+import jakarta.enterprise.concurrent.ManagedTask;
+import jakarta.enterprise.concurrent.ManagedTaskListener;
 
 
 public class ManagedBlockingRunnableTask extends BlockingRunnableImpl implements ManagedTask {

src/test/java/org/glassfish/enterprise/concurrent/test/ManagedCallableTask.java

@@ -16,10 +16,9 @@
 
 package org.glassfish.enterprise.concurrent.test;
 
-import java.util.Locale;
 import java.util.Map;
-import javax.enterprise.concurrent.ManagedTask;
-import javax.enterprise.concurrent.ManagedTaskListener;
+import jakarta.enterprise.concurrent.ManagedTask;
+import jakarta.enterprise.concurrent.ManagedTaskListener;
 
 
 public class ManagedCallableTask<V> extends CallableImpl<V> implements ManagedTask {

src/test/java/org/glassfish/enterprise/concurrent/test/ManagedRunnableTask.java

@@ -17,8 +17,8 @@
 package org.glassfish.enterprise.concurrent.test;
 
 import java.util.Map;
-import javax.enterprise.concurrent.ManagedTask;
-import javax.enterprise.concurrent.ManagedTaskListener;
+import jakarta.enterprise.concurrent.ManagedTask;
+import jakarta.enterprise.concurrent.ManagedTaskListener;
 
 
 public class ManagedRunnableTask extends RunnableImpl implements ManagedTask {

src/test/java/org/glassfish/enterprise/concurrent/test/ManagedTaskListenerImpl.java

@@ -21,8 +21,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import javax.enterprise.concurrent.ManagedExecutorService;
-import javax.enterprise.concurrent.ManagedTaskListener;
+import jakarta.enterprise.concurrent.ManagedExecutorService;
+import jakarta.enterprise.concurrent.ManagedTaskListener;
 import static junit.framework.Assert.*;
 
 public class ManagedTaskListenerImpl implements ManagedTaskListener {

src/test/java/org/glassfish/enterprise/concurrent/test/ManagedTimeRecordingRunnableTask.java

@@ -16,10 +16,9 @@
 
 package org.glassfish.enterprise.concurrent.test;
 
-import java.util.Locale;
 import java.util.Map;
-import javax.enterprise.concurrent.ManagedTask;
-import javax.enterprise.concurrent.ManagedTaskListener;
+import jakarta.enterprise.concurrent.ManagedTask;
+import jakarta.enterprise.concurrent.ManagedTaskListener;
 
 
 public class ManagedTimeRecordingRunnableTask extends TimeRecordingRunnableImpl implements ManagedTask {