Update for javax to jakarta package name change

Signed-off-by: Scott M Stark <starksm64@gmail.com>
jakartaee · Dec 13, 2019 · d0d86a2 · d0d86a2
1 parent 6e0ebe5
commit d0d86a2
Show file tree

Hide file tree

Showing 16 changed files with 61 additions and 55 deletions.
diff --git a/README.adoc b/README.adoc
@@ -4,7 +4,7 @@ This project contains the Jakarta Dependency Injection TCK and user guide.
 
 == Software Requirements
 
-* A Java SE 8 runtime
+* A Java SE 11 or 8 runtime
 * Maven 3.3.x +
 
 == Installation
@@ -21,7 +21,7 @@ mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
 -Dfile=target/jakarta.inject-tck-1.0.jar  -Dfile=jakarta-di-tck-x.y.jar
 ----
 making sure your replace the x.y with the corresponding version found in the
-TCK download, e.g., 1.0.
+TCK download, e.g., 2.0.0.
 
 === Running the TCK
 
@@ -36,8 +36,8 @@ import junit.framework.Test;
 import org.atinject.tck.Tck;
 import org.atinject.tck.auto.Car;
 
-import javax.enterprise.inject.se.SeContainer;
-import javax.enterprise.inject.se.SeContainerInitializer;
+import jakarta.enterprise.inject.se.SeContainer;
+import jakarta.enterprise.inject.se.SeContainerInitializer;
 
 public class SampleBootstrapTCK {
 
@@ -82,7 +82,7 @@ the DI container in order for the tests to pass:
 * `org.atinject.tck.auto.Seat` is implemented by `org.atinject.tck.auto.Seat` itself, and
 `org.atinject.tck.auto.Tire` by `org.atinject.tck.auto.Tire` itself (not subclasses).
 * `org.atinject.tck.auto.Engine` is implemented by `org.atinject.tck.auto.V8Engine`.
-* `@javax.inject.Named("spare") org.atinject.tck.auto.Tire` is implemented by
+* `@jakarta.inject.Named("spare") org.atinject.tck.auto.Tire` is implemented by
      `org.atinject.tck.auto.accessories.SpareTire`.
 * The following classes may also be injected directly:
 ** `org.atinject.tck.auto.accessories.Cupholder`
@@ -105,37 +105,36 @@ You can run the Weld bootstrap example as follows:
 
 [source,bash]
 ----
-Scotts-iMacPro:example starksm$ mvn compile test
+Scotts-iMacPro:example starksm$ mvn test
 [INFO] Scanning for projects...
-[INFO] 
+[INFO]
 [INFO] -------------< jakarta.inject:jakarta.inject-tck-example >--------------
-[INFO] Building Jakarta Dependency Injection API TCK Example 1.0
+[INFO] Building Jakarta Dependency Injection API TCK Example 2.0.0-SNAPSHOT
 [INFO] --------------------------------[ jar ]---------------------------------
-[INFO] 
 ...
-[INFO] 
+[INFO]
 [INFO] -------------------------------------------------------
 [INFO]  T E S T S
 [INFO] -------------------------------------------------------
 [INFO] Running SampleBootstrapTCK
-Jul 26, 2019 6:33:20 PM org.jboss.weld.bootstrap.WeldStartup <clinit>
-INFO: WELD-000900: 3.1.1 (Final)
-Jul 26, 2019 6:33:21 PM org.jboss.weld.bootstrap.WeldStartup startContainer
+Dec 12, 2019 9:34:01 PM org.jboss.weld.bootstrap.WeldStartup <clinit>
+INFO: WELD-000900: 4.0.0 (2019-12-13 03:17)
+Dec 12, 2019 9:34:01 PM org.jboss.weld.bootstrap.WeldStartup startContainer
 INFO: WELD-000101: Transactional services not available. Injection of @Inject UserTransaction not available. Transactional observers will be invoked synchronously.
-Jul 26, 2019 6:33:21 PM org.jboss.weld.environment.se.WeldContainer fireContainerInitializedEvent
-INFO: WELD-ENV-002003: Weld SE container 08dc1244-b725-4382-ad19-7eced6c55608 initialized
-[INFO] Tests run: 50, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.543 s - in SampleBootstrapTCK
-Weld SE container 08dc1244-b725-4382-ad19-7eced6c55608 shut down by shutdown hook
-[INFO] 
+Dec 12, 2019 9:34:01 PM org.jboss.weld.environment.se.WeldContainer fireContainerInitializedEvent
+INFO: WELD-ENV-002003: Weld SE container b46a7a8a-5c6c-4d49-8a3f-a8a153b0173e initialized
+[INFO] Tests run: 50, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.52 s - in SampleBootstrapTCK
+Weld SE container b46a7a8a-5c6c-4d49-8a3f-a8a153b0173e shut down by shutdown hook
+[INFO]
 [INFO] Results:
-[INFO] 
+[INFO]
 [INFO] Tests run: 50, Failures: 0, Errors: 0, Skipped: 0
-[INFO] 
+[INFO]
 [INFO] ------------------------------------------------------------------------
 [INFO] BUILD SUCCESS
 [INFO] ------------------------------------------------------------------------
-[INFO] Total time:  2.593 s
-[INFO] Finished at: 2019-07-26T18:33:21-07:00
+[INFO] Total time:  2.545 s
+[INFO] Finished at: 2019-12-12T21:34:02-06:00
 [INFO] ------------------------------------------------------------------------
 ----
 

diff --git a/example/pom.xml b/example/pom.xml
@@ -2,20 +2,23 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>jakarta.inject</groupId>
     <artifactId>jakarta.inject-tck-example</artifactId>
-    <version>1.0</version>
+    <version>2.0.0-SNAPSHOT</version>
     <name>Jakarta Dependency Injection API TCK Example</name>
     <description>The Jakarta Dependency Injection API - TCK Example</description>
 
     <properties>
         <runSuite>**/SampleBootstrapTCK.class</runSuite>
-        <weld.version>3.1.1.Final</weld.version>
+        <weld.version>4.0.0-SNAPSHOT</weld.version>
+        <atinject.version>2.0.0-SNAPSHOT</atinject.version>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>jakarta.inject</groupId>
             <artifactId>jakarta.inject-tck</artifactId>
-            <version>1.0</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -56,14 +59,14 @@
                         <artifactItem>
                             <groupId>jakarta.inject</groupId>
                             <artifactId>jakarta.inject-api</artifactId>
-                            <version>1.0</version>
+                            <version>${atinject.version}</version>
                             <overWrite>false</overWrite>
                             <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
                         </artifactItem>
                         <artifactItem>
                             <groupId>jakarta.inject</groupId>
                             <artifactId>jakarta.inject-tck</artifactId>
-                            <version>1.0</version>
+                            <version>${project.version}</version>
                             <overWrite>false</overWrite>
                             <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
                         </artifactItem>

diff --git a/example/src/test/java/SampleBootstrapTCK.java b/example/src/test/java/SampleBootstrapTCK.java
@@ -2,8 +2,8 @@
 import org.atinject.tck.Tck;
 import org.atinject.tck.auto.Car;
 
-import javax.enterprise.inject.se.SeContainer;
-import javax.enterprise.inject.se.SeContainerInitializer;
+import jakarta.enterprise.inject.se.SeContainer;
+import jakarta.enterprise.inject.se.SeContainerInitializer;
 
 public class SampleBootstrapTCK {
 

diff --git a/example/src/test/java/TCKProducers.java b/example/src/test/java/TCKProducers.java
@@ -20,12 +20,12 @@
 import org.atinject.tck.auto.Tire;
 import org.atinject.tck.auto.accessories.SpareTire;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.New;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.Typed;
-import javax.inject.Named;
-import javax.inject.Qualifier;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.New;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Typed;
+import jakarta.inject.Named;
+import jakarta.inject.Qualifier;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>jakarta.inject</groupId>
   <artifactId>jakarta.inject-tck</artifactId>
-  <version>1.0</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Jakarta Dependency Injection API TCK</name>
   <description>The Jakarta Dependency Injection API - TCK</description>
@@ -28,11 +28,15 @@
     <tag>HEAD</tag>
   </scm>
 
+  <properties>
+    <atinject.version>2.0.0-SNAPSHOT</atinject.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>jakarta.inject</groupId>
       <artifactId>jakarta.inject-api</artifactId>
-      <version>1.0</version>
+      <version>${atinject.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/src/main/java/org/atinject/tck/auto/Convertible.java b/src/main/java/org/atinject/tck/auto/Convertible.java
@@ -16,9 +16,9 @@
 
 package org.atinject.tck.auto;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
 
 import junit.framework.TestCase;
 import org.atinject.tck.auto.accessories.Cupholder;

diff --git a/src/main/java/org/atinject/tck/auto/Drivers.java b/src/main/java/org/atinject/tck/auto/Drivers.java
@@ -19,7 +19,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 @Retention(RetentionPolicy.RUNTIME) @Qualifier
 public @interface Drivers {

diff --git a/src/main/java/org/atinject/tck/auto/DriversSeat.java b/src/main/java/org/atinject/tck/auto/DriversSeat.java
@@ -16,7 +16,7 @@
 
 package org.atinject.tck.auto;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.atinject.tck.auto.accessories.Cupholder;
 

diff --git a/src/main/java/org/atinject/tck/auto/Engine.java b/src/main/java/org/atinject/tck/auto/Engine.java
@@ -16,8 +16,8 @@
 
 package org.atinject.tck.auto;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.atinject.tck.auto.accessories.SpareTire;
 

diff --git a/src/main/java/org/atinject/tck/auto/GasEngine.java b/src/main/java/org/atinject/tck/auto/GasEngine.java
@@ -16,7 +16,7 @@
 
 package org.atinject.tck.auto;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public abstract class GasEngine extends Engine {
 

diff --git a/src/main/java/org/atinject/tck/auto/Seat.java b/src/main/java/org/atinject/tck/auto/Seat.java
@@ -16,8 +16,8 @@
 
 package org.atinject.tck.auto;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import org.atinject.tck.auto.accessories.Cupholder;
 

diff --git a/src/main/java/org/atinject/tck/auto/Tire.java b/src/main/java/org/atinject/tck/auto/Tire.java
@@ -19,7 +19,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.atinject.tck.auto.accessories.RoundThing;
 import org.atinject.tck.auto.accessories.SpareTire;

diff --git a/src/main/java/org/atinject/tck/auto/V8Engine.java b/src/main/java/org/atinject/tck/auto/V8Engine.java
@@ -16,8 +16,8 @@
 
 package org.atinject.tck.auto;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.atinject.tck.auto.accessories.SpareTire;
 

diff --git a/src/main/java/org/atinject/tck/auto/accessories/Cupholder.java b/src/main/java/org/atinject/tck/auto/accessories/Cupholder.java
@@ -16,9 +16,9 @@
 
 package org.atinject.tck.auto.accessories;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 import org.atinject.tck.auto.Seat;
 

diff --git a/src/main/java/org/atinject/tck/auto/accessories/RoundThing.java b/src/main/java/org/atinject/tck/auto/accessories/RoundThing.java
@@ -16,7 +16,7 @@
 
 package org.atinject.tck.auto.accessories;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class RoundThing {
 

diff --git a/src/main/java/org/atinject/tck/auto/accessories/SpareTire.java b/src/main/java/org/atinject/tck/auto/accessories/SpareTire.java
@@ -16,7 +16,7 @@
 
 package org.atinject.tck.auto.accessories;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.atinject.tck.auto.FuelTank;
 import org.atinject.tck.auto.Tire;