From d0d86a2e5433905a2292cfd0a42bc366d1ff0ff5 Mon Sep 17 00:00:00 2001 From: Scott M Stark Date: Thu, 12 Dec 2019 21:36:34 -0600 Subject: [PATCH] Update for javax to jakarta package name change Signed-off-by: Scott M Stark --- README.adoc | 43 +++++++++---------- example/pom.xml | 13 +++--- example/src/test/java/SampleBootstrapTCK.java | 4 +- example/src/test/java/TCKProducers.java | 12 +++--- pom.xml | 8 +++- .../org/atinject/tck/auto/Convertible.java | 6 +-- .../java/org/atinject/tck/auto/Drivers.java | 2 +- .../org/atinject/tck/auto/DriversSeat.java | 2 +- .../java/org/atinject/tck/auto/Engine.java | 4 +- .../java/org/atinject/tck/auto/GasEngine.java | 2 +- src/main/java/org/atinject/tck/auto/Seat.java | 4 +- src/main/java/org/atinject/tck/auto/Tire.java | 2 +- .../java/org/atinject/tck/auto/V8Engine.java | 4 +- .../tck/auto/accessories/Cupholder.java | 6 +-- .../tck/auto/accessories/RoundThing.java | 2 +- .../tck/auto/accessories/SpareTire.java | 2 +- 16 files changed, 61 insertions(+), 55 deletions(-) diff --git a/README.adoc b/README.adoc index b5c43cc..3865b7c 100644 --- 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 -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 +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 index 559c50c..646fbaf 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -2,20 +2,23 @@ 4.0.0 jakarta.inject jakarta.inject-tck-example - 1.0 + 2.0.0-SNAPSHOT Jakarta Dependency Injection API TCK Example The Jakarta Dependency Injection API - TCK Example **/SampleBootstrapTCK.class - 3.1.1.Final + 4.0.0-SNAPSHOT + 2.0.0-SNAPSHOT + 1.8 + 1.8 jakarta.inject jakarta.inject-tck - 1.0 + ${project.version} junit @@ -56,14 +59,14 @@ jakarta.inject jakarta.inject-api - 1.0 + ${atinject.version} false ${project.build.directory}/test-classes jakarta.inject jakarta.inject-tck - 1.0 + ${project.version} false ${project.build.directory}/test-classes diff --git a/example/src/test/java/SampleBootstrapTCK.java b/example/src/test/java/SampleBootstrapTCK.java index 3dc1baa..e259b2b 100644 --- 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 index e36440b..500c0aa 100644 --- 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 index 4da9d75..d974b1e 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ jakarta.inject jakarta.inject-tck - 1.0 + 2.0.0-SNAPSHOT jar Jakarta Dependency Injection API TCK The Jakarta Dependency Injection API - TCK @@ -28,11 +28,15 @@ HEAD + + 2.0.0-SNAPSHOT + + jakarta.inject jakarta.inject-api - 1.0 + ${atinject.version} junit diff --git a/src/main/java/org/atinject/tck/auto/Convertible.java b/src/main/java/org/atinject/tck/auto/Convertible.java index b85203f..b00b2ab 100644 --- 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 index ddc554e..e2c56ef 100644 --- 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 index 6ff5375..ea9b4ef 100644 --- 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 index 052a67c..001a5ae 100644 --- 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 index 6f7edf1..425466d 100644 --- 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 index 329e435..7913ff1 100644 --- 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 index 0485cbd..1fd22c4 100644 --- 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 index 801f210..0fbaa14 100644 --- 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 index b63a245..2cf6102 100644 --- 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 index 582979c..d126281 100644 --- 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 index fdb3ce3..55685bd 100644 --- 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;