From 822c8261cc33a0db27cdf318e40dcd52013f83ca Mon Sep 17 00:00:00 2001
From: Ivar Grimstad <ivar.grimstad@eclipse-foundation.org>
Date: Fri, 14 Jun 2024 13:40:47 +0000
Subject: [PATCH 1/2] Replace the text Java EE with Jakarta EE where
 appropriate

---
 api/src/main/java/org/jboss/cdi/tck/api/Configuration.java    | 2 +-
 dist-build/jboss-runner.pom                                   | 2 +-
 dist-build/lang-model-tck-runner/pom.xml                      | 2 +-
 impl/src/main/java/org/jboss/cdi/tck/TestGroups.java          | 2 +-
 .../src/main/java/org/jboss/cdi/tck/util/JndiLookupUtils.java | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/src/main/java/org/jboss/cdi/tck/api/Configuration.java b/api/src/main/java/org/jboss/cdi/tck/api/Configuration.java
index 620612790..e67382966 100644
--- a/api/src/main/java/org/jboss/cdi/tck/api/Configuration.java
+++ b/api/src/main/java/org/jboss/cdi/tck/api/Configuration.java
@@ -117,7 +117,7 @@ public interface Configuration {
     public void setLibraryDirectory(String libraryDir);
 
     /**
-     * Few TCK tests need to work with Java EE services related to persistence (JPA, JTA) - test datasource must be provided.
+     * Few TCK tests need to work with Jakarta EE services related to persistence (JPA, JTA) - test datasource must be provided.
      * These tests belong to testng group
      * <code>persistence</code>.
      *
diff --git a/dist-build/jboss-runner.pom b/dist-build/jboss-runner.pom
index eea8b7b1f..b1af5578b 100644
--- a/dist-build/jboss-runner.pom
+++ b/dist-build/jboss-runner.pom
@@ -444,7 +444,7 @@
       </build>
     </profile>
 
-    <!-- Run the TCK in the managed container (full Java EE platform) -->
+    <!-- Run the TCK in the managed container (full Jakarta EE platform) -->
     <profile>
       <id>incontainer</id>
       <activation>
diff --git a/dist-build/lang-model-tck-runner/pom.xml b/dist-build/lang-model-tck-runner/pom.xml
index 388cba7a9..bb2ee4b7b 100644
--- a/dist-build/lang-model-tck-runner/pom.xml
+++ b/dist-build/lang-model-tck-runner/pom.xml
@@ -127,7 +127,7 @@
             </dependencies>
         </profile>
 
-        <!-- Run the TCK in the managed container (full Java EE platform) -->
+        <!-- Run the TCK in the managed container (full Jakarta EE platform) -->
         <profile>
             <id>incontainer</id>
             <activation>
diff --git a/impl/src/main/java/org/jboss/cdi/tck/TestGroups.java b/impl/src/main/java/org/jboss/cdi/tck/TestGroups.java
index bb566ab59..92b5186db 100644
--- a/impl/src/main/java/org/jboss/cdi/tck/TestGroups.java
+++ b/impl/src/main/java/org/jboss/cdi/tck/TestGroups.java
@@ -20,7 +20,7 @@
  * <ul>
  * <li>{@link #CDI_FULL} - used to exclude the superset of CDI tests that do not apply to CDI-lite implementations</li>
  * <li>{@link #INTEGRATION} - used to exclude integration tests when running standalone container</li>
- * <li>{@link #JAVAEE_FULL} - subset of integration tests used to exclude tests that require full Java EE platform; tests that
+ * <li>{@link #JAVAEE_FULL} - subset of integration tests used to exclude tests that require full Jakarta EE platform; tests that
  * belong to this group are also considered to be integration tests</li>
  * </ul>
  *
diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/JndiLookupUtils.java b/impl/src/main/java/org/jboss/cdi/tck/util/JndiLookupUtils.java
index 64c811831..b911db219 100644
--- a/impl/src/main/java/org/jboss/cdi/tck/util/JndiLookupUtils.java
+++ b/impl/src/main/java/org/jboss/cdi/tck/util/JndiLookupUtils.java
@@ -32,10 +32,10 @@ public static Object lookup(String jndiName) {
         try {
             object = new InitialContext().lookup(jndiName);
         } catch (NamingException e) {
-            throw new IllegalStateException("Unable to lookup Java EE component with JNDI name: " + jndiName, e);
+            throw new IllegalStateException("Unable to lookup Jakarta EE component with JNDI name: " + jndiName, e);
         }
 
-        logger.log("Java EE component with JNDI name {0} found: {1}", jndiName, object.toString());
+        logger.log("Jakarta EE component with JNDI name {0} found: {1}", jndiName, object.toString());
 
         return object;
     }

From 16d422375c467aae86608f5670dbe6aed90da15c Mon Sep 17 00:00:00 2001
From: Ivar Grimstad <ivar.grimstad@eclipse-foundation.org>
Date: Sat, 15 Jun 2024 08:07:59 +0200
Subject: [PATCH 2/2] Update TestGroups.java

Line length
---
 impl/src/main/java/org/jboss/cdi/tck/TestGroups.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/impl/src/main/java/org/jboss/cdi/tck/TestGroups.java b/impl/src/main/java/org/jboss/cdi/tck/TestGroups.java
index 92b5186db..f42fc3f3e 100644
--- a/impl/src/main/java/org/jboss/cdi/tck/TestGroups.java
+++ b/impl/src/main/java/org/jboss/cdi/tck/TestGroups.java
@@ -20,8 +20,8 @@
  * <ul>
  * <li>{@link #CDI_FULL} - used to exclude the superset of CDI tests that do not apply to CDI-lite implementations</li>
  * <li>{@link #INTEGRATION} - used to exclude integration tests when running standalone container</li>
- * <li>{@link #JAVAEE_FULL} - subset of integration tests used to exclude tests that require full Jakarta EE platform; tests that
- * belong to this group are also considered to be integration tests</li>
+ * <li>{@link #JAVAEE_FULL} - subset of integration tests used to exclude tests that require full Jakarta EE platform; tests
+ * that belong to this group are also considered to be integration tests</li>
  * </ul>
  *
  * @author Martin Kouba