Merge pull request #1607 from jakartaredhat/master

Rename the tck directories to match the packages, #1606, #1600
jakartaee · Feb 6, 2022 · 07843e2 · 07843e2
2 parents 7140de1 + 2ef901b
commit 07843e2
Show file tree

Hide file tree

Showing 240 changed files with 38 additions and 36 deletions.
diff --git a/...vaee7/cdibeanvalidator/FooConstraint.java → ...dator/cdibeanvalidator/FooConstraint.java b/...vaee7/cdibeanvalidator/FooConstraint.java → ...dator/cdibeanvalidator/FooConstraint.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdibeanvalidator;
+package ee.jakarta.tck.faces.test.javaee7.cdibeanvalidator.cdibeanvalidator;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

diff --git a/...beanvalidator/FooConstraintValidator.java → ...beanvalidator/FooConstraintValidator.java b/...beanvalidator/FooConstraintValidator.java → ...beanvalidator/FooConstraintValidator.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdibeanvalidator;
+package ee.jakarta.tck.faces.test.javaee7.cdibeanvalidator.cdibeanvalidator;
 
 import jakarta.inject.Inject;
 import jakarta.validation.ConstraintValidator;

diff --git a/...st/javaee7/cdibeanvalidator/UserBean.java → ...nvalidator/cdibeanvalidator/UserBean.java b/...st/javaee7/cdibeanvalidator/UserBean.java → ...nvalidator/cdibeanvalidator/UserBean.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdibeanvalidator;
+package ee.jakarta.tck.faces.test.javaee7.cdibeanvalidator.cdibeanvalidator;
 
 import java.io.Serializable;
 import java.util.Date;

diff --git a/...javaee7/cdibeanvalidator/Issue3014IT.java → ...lidator/cdibeanvalidator/Issue3014IT.java b/...javaee7/cdibeanvalidator/Issue3014IT.java → ...lidator/cdibeanvalidator/Issue3014IT.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdibeanvalidator;
+package ee.jakarta.tck.faces.test.javaee7.cdibeanvalidator.cdibeanvalidator;
 
 import static java.lang.System.getProperty;
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;

diff --git a/.../javaee7/cdiinitdestroyevent/AppBean.java → ...royevent/cdiinitdestroyevent/AppBean.java b/.../javaee7/cdiinitdestroyevent/AppBean.java → ...royevent/cdiinitdestroyevent/AppBean.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent;
+package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent.cdiinitdestroyevent;
 
 import java.io.Serializable;
 

diff --git a/...vaee7/cdiinitdestroyevent/FlowLogger.java → ...event/cdiinitdestroyevent/FlowLogger.java b/...vaee7/cdiinitdestroyevent/FlowLogger.java → ...event/cdiinitdestroyevent/FlowLogger.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent;
+package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent.cdiinitdestroyevent;
 
 import static java.lang.System.currentTimeMillis;
 

diff --git a/...e7/cdiinitdestroyevent/Issue2997Bean.java → ...nt/cdiinitdestroyevent/Issue2997Bean.java b/...e7/cdiinitdestroyevent/Issue2997Bean.java → ...nt/cdiinitdestroyevent/Issue2997Bean.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent;
+package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent.cdiinitdestroyevent;
 
 import static java.lang.System.currentTimeMillis;
 

diff --git a/...e7/cdiinitdestroyevent/SessionLogger.java → ...nt/cdiinitdestroyevent/SessionLogger.java b/...e7/cdiinitdestroyevent/SessionLogger.java → ...nt/cdiinitdestroyevent/SessionLogger.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent;
+package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent.cdiinitdestroyevent;
 
 import static java.lang.System.currentTimeMillis;
 

diff --git a/...cdiinitdestroyevent/SimplestFlowBean.java → ...cdiinitdestroyevent/SimplestFlowBean.java b/...cdiinitdestroyevent/SimplestFlowBean.java → ...cdiinitdestroyevent/SimplestFlowBean.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent;
+package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent.cdiinitdestroyevent;
 
 import java.io.Serializable;
 

diff --git a/...javaee7/cdiinitdestroyevent/UserBean.java → ...oyevent/cdiinitdestroyevent/UserBean.java b/...javaee7/cdiinitdestroyevent/UserBean.java → ...oyevent/cdiinitdestroyevent/UserBean.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent;
+package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent.cdiinitdestroyevent;
 
 import java.io.Serializable;
 import java.util.Date;

diff --git a/...7/cdiinitdestroyevent/ViewScopedBean.java → ...t/cdiinitdestroyevent/ViewScopedBean.java b/...7/cdiinitdestroyevent/ViewScopedBean.java → ...t/cdiinitdestroyevent/ViewScopedBean.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent;
+package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent.cdiinitdestroyevent;
 
 import java.io.Serializable;
 import jakarta.annotation.PostConstruct;

diff --git a/...cdiinitdestroyevent/ViewScopedLogger.java → ...cdiinitdestroyevent/ViewScopedLogger.java b/...cdiinitdestroyevent/ViewScopedLogger.java → ...cdiinitdestroyevent/ViewScopedLogger.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent;
+package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent.cdiinitdestroyevent;
 
 import static java.lang.System.currentTimeMillis;
 

diff --git a/...aee7/cdiinitdestroyevent/Issue2948IT.java → ...vent/cdiinitdestroyevent/Issue2948IT.java b/...aee7/cdiinitdestroyevent/Issue2948IT.java → ...vent/cdiinitdestroyevent/Issue2948IT.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent;
+package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent.cdiinitdestroyevent;
 
 import static java.lang.System.getProperty;
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;

diff --git a/...aee7/cdiinitdestroyevent/Issue2997IT.java → ...vent/cdiinitdestroyevent/Issue2997IT.java b/...aee7/cdiinitdestroyevent/Issue2997IT.java → ...vent/cdiinitdestroyevent/Issue2997IT.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent;
+package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent.cdiinitdestroyevent;
 
 import static java.lang.System.getProperty;
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;

diff --git a/...aee7/cdiinitdestroyevent/Issue4646IT.java → ...vent/cdiinitdestroyevent/Issue4646IT.java b/...aee7/cdiinitdestroyevent/Issue4646IT.java → ...vent/cdiinitdestroyevent/Issue4646IT.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent;
+package ee.jakarta.tck.faces.test.javaee7.cdiinitdestroyevent.cdiinitdestroyevent;
 
 import static java.lang.Integer.parseInt;
 import static java.lang.System.getProperty;

diff --git a/...e7/cdimethodvalidation/FooConstraint.java → ...on/cdimethodvalidation/FooConstraint.java b/...e7/cdimethodvalidation/FooConstraint.java → ...on/cdimethodvalidation/FooConstraint.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdimethodvalidation;
+package ee.jakarta.tck.faces.test.javaee7.cdimethodvalidation.cdimethodvalidation;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

diff --git a/...hodvalidation/FooConstraintValidator.java → ...hodvalidation/FooConstraintValidator.java b/...hodvalidation/FooConstraintValidator.java → ...hodvalidation/FooConstraintValidator.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdimethodvalidation;
+package ee.jakarta.tck.faces.test.javaee7.cdimethodvalidation.cdimethodvalidation;
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;

diff --git a/...ee7/cdimethodvalidation/HelloService.java → ...ion/cdimethodvalidation/HelloService.java b/...ee7/cdimethodvalidation/HelloService.java → ...ion/cdimethodvalidation/HelloService.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdimethodvalidation;
+package ee.jakarta.tck.faces.test.javaee7.cdimethodvalidation.cdimethodvalidation;
 
 import java.io.Serializable;
 

diff --git a/...javaee7/cdimethodvalidation/UserBean.java → ...idation/cdimethodvalidation/UserBean.java b/...javaee7/cdimethodvalidation/UserBean.java → ...idation/cdimethodvalidation/UserBean.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdimethodvalidation;
+package ee.jakarta.tck.faces.test.javaee7.cdimethodvalidation.cdimethodvalidation;
 
 import java.io.Serializable;
 

diff --git a/...imethodvalidation/MethodValidationIT.java → ...imethodvalidation/MethodValidationIT.java b/...imethodvalidation/MethodValidationIT.java → ...imethodvalidation/MethodValidationIT.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdimethodvalidation;
+package ee.jakarta.tck.faces.test.javaee7.cdimethodvalidation.cdimethodvalidation;
 
 import static java.lang.System.getProperty;
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;

diff --git a/.../cdimultitenantsetstccl/BeforeFilter.java → .../cdimultitenantsetstccl/BeforeFilter.java b/.../cdimultitenantsetstccl/BeforeFilter.java → .../cdimultitenantsetstccl/BeforeFilter.java
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package ee.jakarta.tck.faces.test.javaee7.cdimultitenantsetstccl;
+package ee.jakarta.tck.faces.test.javaee7.cdimultitenantsetstccl.cdimultitenantsetstccl;
 
 import static jakarta.faces.FactoryFinder.FACES_CONTEXT_FACTORY;
 import static jakarta.faces.FactoryFinder.LIFECYCLE_FACTORY;

diff --git a/...aee7/cdimultitenantsetstccl/UserBean.java → ...tccl/cdimultitenantsetstccl/UserBean.java b/...aee7/cdimultitenantsetstccl/UserBean.java → ...tccl/cdimultitenantsetstccl/UserBean.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.javaee7.cdimultitenantsetstccl;
+package ee.jakarta.tck.faces.test.javaee7.cdimultitenantsetstccl.cdimultitenantsetstccl;
 
 import java.io.Serializable;
 import java.util.Date;

diff --git a/tck/faces22/cdiMultiTenantSetsTccl/src/main/webapp/WEB-INF/web.xml b/tck/faces22/cdiMultiTenantSetsTccl/src/main/webapp/WEB-INF/web.xml
@@ -37,7 +37,7 @@
 
     <filter>
         <filter-name>BeforeFilter</filter-name>
-        <filter-class>ee.jakarta.tck.faces.test.javaee7.cdimultitenantsetstccl.BeforeFilter</filter-class>
+        <filter-class>ee.jakarta.tck.faces.test.javaee7.cdimultitenantsetstccl.cdimultitenantsetstccl.BeforeFilter</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>BeforeFilter</filter-name>

diff --git a/...7/cdimultitenantsetstccl/Issue3341IT.java → ...l/cdimultitenantsetstccl/Issue3341IT.java b/...7/cdimultitenantsetstccl/Issue3341IT.java → ...l/cdimultitenantsetstccl/Issue3341IT.java
@@ -14,7 +14,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package ee.jakarta.tck.faces.test.javaee7.cdimultitenantsetstccl;
+package ee.jakarta.tck.faces.test.javaee7.cdimultitenantsetstccl.cdimultitenantsetstccl;
 
 import static java.lang.System.getProperty;
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;

diff --git a/...vaee7/cdinobeansxml/SimplestFlowBean.java → ...vaee7/cdinobeansxml/SimplestFlowBean.java b/...vaee7/cdinobeansxml/SimplestFlowBean.java → ...vaee7/cdinobeansxml/SimplestFlowBean.java
diff --git a/...t/javaee7/cdinobeansxml/NoBeansXmlIT.java → ...t/javaee7/cdinobeansxml/NoBeansXmlIT.java b/...t/javaee7/cdinobeansxml/NoBeansXmlIT.java → ...t/javaee7/cdinobeansxml/NoBeansXmlIT.java
diff --git a/...t/javaee7/childCountTest/TestServlet.java → ...t/javaee7/childCountTest/TestServlet.java b/...t/javaee7/childCountTest/TestServlet.java → ...t/javaee7/childCountTest/TestServlet.java
diff --git a/...aee7/childCountTest/ChildCountTestIT.java → ...aee7/childCountTest/ChildCountTestIT.java b/...aee7/childCountTest/ChildCountTestIT.java → ...aee7/childCountTest/ChildCountTestIT.java
diff --git a/...a/com/sun/faces/test/javaee7/el/Book.java → ...karta/tck/faces/test/javaee7/el/Book.java b/...a/com/sun/faces/test/javaee7/el/Book.java → ...karta/tck/faces/test/javaee7/el/Book.java
diff --git a/...ces/test/javaee7/el/BookTableBacking.java → ...ces/test/javaee7/el/BookTableBacking.java b/...ces/test/javaee7/el/BookTableBacking.java → ...ces/test/javaee7/el/BookTableBacking.java
diff --git a/...om/sun/faces/test/javaee7/el/Library.java → ...ta/tck/faces/test/javaee7/el/Library.java b/...om/sun/faces/test/javaee7/el/Library.java → ...ta/tck/faces/test/javaee7/el/Library.java
diff --git a/.../faces/test/javaee7/el/BasicLambdaIT.java → .../faces/test/javaee7/el/BasicLambdaIT.java b/.../faces/test/javaee7/el/BasicLambdaIT.java → .../faces/test/javaee7/el/BasicLambdaIT.java
diff --git a/...t/javaee7/facelets/SessionController.java → ...t/javaee7/facelets/SessionController.java b/...t/javaee7/facelets/SessionController.java → ...t/javaee7/facelets/SessionController.java
diff --git a/.../javaee7/facelets/VerifyTemplateUIIT.java → .../javaee7/facelets/VerifyTemplateUIIT.java b/.../javaee7/facelets/VerifyTemplateUIIT.java → .../javaee7/facelets/VerifyTemplateUIIT.java
diff --git a/.../multiFieldValidation/PasswordHolder.java → .../multiFieldValidation/PasswordHolder.java b/.../multiFieldValidation/PasswordHolder.java → .../multiFieldValidation/PasswordHolder.java
diff --git a/...nditions/FailingDevTimePreconditions.java → ...nditions/FailingDevTimePreconditions.java b/...nditions/FailingDevTimePreconditions.java → ...nditions/FailingDevTimePreconditions.java
diff --git a/...failingDevTimePreconditions/Password.java → ...failingDevTimePreconditions/Password.java b/...failingDevTimePreconditions/Password.java → ...failingDevTimePreconditions/Password.java
diff --git a/...reconditions/PasswordValidationGroup.java → ...reconditions/PasswordValidationGroup.java b/...reconditions/PasswordValidationGroup.java → ...reconditions/PasswordValidationGroup.java
diff --git a/...vTimePreconditions/PasswordValidator.java → ...vTimePreconditions/PasswordValidator.java b/...vTimePreconditions/PasswordValidator.java → ...vTimePreconditions/PasswordValidator.java
diff --git a/...tiFieldValidation/simple/BackingBean.java → ...tiFieldValidation/simple/BackingBean.java b/...tiFieldValidation/simple/BackingBean.java → ...tiFieldValidation/simple/BackingBean.java
diff --git a/...multiFieldValidation/simple/Password.java → ...multiFieldValidation/simple/Password.java b/...multiFieldValidation/simple/Password.java → ...multiFieldValidation/simple/Password.java
diff --git a/...ation/simple/PasswordValidationGroup.java → ...ation/simple/PasswordValidationGroup.java b/...ation/simple/PasswordValidationGroup.java → ...ation/simple/PasswordValidationGroup.java
diff --git a/...dValidation/simple/PasswordValidator.java → ...dValidation/simple/PasswordValidator.java b/...dValidation/simple/PasswordValidator.java → ...dValidation/simple/PasswordValidator.java
diff --git a/...javaee7/multiFieldValidation/Spec1IT.java → ...javaee7/multiFieldValidation/Spec1IT.java b/...javaee7/multiFieldValidation/Spec1IT.java → ...javaee7/multiFieldValidation/Spec1IT.java
diff --git a/...test/javaee7/protectedview/Page2Bean.java → ...test/javaee7/protectedview/Page2Bean.java b/...test/javaee7/protectedview/Page2Bean.java → ...test/javaee7/protectedview/Page2Bean.java
diff --git a/.../javaee7/protectedview/Bug22995287IT.java → .../javaee7/protectedview/Bug22995287IT.java b/.../javaee7/protectedview/Bug22995287IT.java → .../javaee7/protectedview/Bug22995287IT.java
diff --git a/...ee7/viewActionCdiViewScoped/UserBean.java → ...ee7/viewActionCdiViewScoped/UserBean.java b/...ee7/viewActionCdiViewScoped/UserBean.java → ...ee7/viewActionCdiViewScoped/UserBean.java
diff --git a/...ViewScoped/ViewActionCdiViewScopedIT.java → ...ViewScoped/ViewActionCdiViewScopedIT.java b/...ViewScoped/ViewActionCdiViewScopedIT.java → ...ViewScoped/ViewActionCdiViewScopedIT.java
diff --git a/...s/test/javaee6web/el/ViewExpiredBean.java → ...s/test/javaee6web/el/ViewExpiredBean.java b/...s/test/javaee6web/el/ViewExpiredBean.java → ...s/test/javaee6web/el/ViewExpiredBean.java
diff --git a/...faces/test/javaee6web/el/Issue3194IT.java → ...faces/test/javaee6web/el/Issue3194IT.java b/...faces/test/javaee6web/el/Issue3194IT.java → ...faces/test/javaee6web/el/Issue3194IT.java
diff --git a/...aee6/viewParamNullValueAjax/TestView.java → ...aee6/viewParamNullValueAjax/TestView.java b/...aee6/viewParamNullValueAjax/TestView.java → ...aee6/viewParamNullValueAjax/TestView.java
diff --git a/...6/viewParamNullValueAjax/Issue4550IT.java → ...6/viewParamNullValueAjax/Issue4550IT.java b/...6/viewParamNullValueAjax/Issue4550IT.java → ...6/viewParamNullValueAjax/Issue4550IT.java
diff --git a/...javaee6web/viewscope/InvalidatedBean.java → ...javaee6web/viewscope/InvalidatedBean.java b/...javaee6web/viewscope/InvalidatedBean.java → ...javaee6web/viewscope/InvalidatedBean.java
diff --git a/.../javaee6web/viewscope/ViewScopedBean.java → .../javaee6web/viewscope/ViewScopedBean.java b/.../javaee6web/viewscope/ViewScopedBean.java → .../javaee6web/viewscope/ViewScopedBean.java
diff --git a/...est/javaee6web/viewscope/Issue2641IT.java → ...est/javaee6web/viewscope/Issue2641IT.java b/...est/javaee6web/viewscope/Issue2641IT.java → ...est/javaee6web/viewscope/Issue2641IT.java
diff --git a/...un/faces/test/javaee8/ajax/Issue3981.java → ...ck/faces/test/javaee8/ajax/Issue3981.java b/...un/faces/test/javaee8/ajax/Issue3981.java → ...ck/faces/test/javaee8/ajax/Issue3981.java
diff --git a/...sun/faces/test/javaee8/ajax/Spec1412.java → ...tck/faces/test/javaee8/ajax/Spec1412.java b/...sun/faces/test/javaee8/ajax/Spec1412.java → ...tck/faces/test/javaee8/ajax/Spec1412.java
diff --git a/...sun/faces/test/javaee8/ajax/Spec1423.java → ...tck/faces/test/javaee8/ajax/Spec1423.java b/...sun/faces/test/javaee8/ajax/Spec1423.java → ...tck/faces/test/javaee8/ajax/Spec1423.java
diff --git a/...ec1423ComponentAddedProgrammatically.java → ...ec1423ComponentAddedProgrammatically.java b/...ec1423ComponentAddedProgrammatically.java → ...ec1423ComponentAddedProgrammatically.java
diff --git a/...jax/Spec1423ComponentAddedViaInclude.java → ...jax/Spec1423ComponentAddedViaInclude.java b/...jax/Spec1423ComponentAddedViaInclude.java → ...jax/Spec1423ComponentAddedViaInclude.java
diff --git a/.../faces/test/javaee8/ajax/Issue3981IT.java → .../faces/test/javaee8/ajax/Issue3981IT.java b/.../faces/test/javaee8/ajax/Issue3981IT.java → .../faces/test/javaee8/ajax/Issue3981IT.java
@@ -37,7 +37,7 @@
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
-import ee.jakarta.tck.faces.test.htmlunit.IgnoringIncorrectnessListener;
+import ee.jakarta.tck.faces.test.htmlunit.htmlunit.IgnoringIncorrectnessListener;
 
 @RunWith(Arquillian.class)
 public class Issue3981IT {

diff --git a/.../faces/test/javaee8/ajax/Issue4115IT.java → .../faces/test/javaee8/ajax/Issue4115IT.java b/.../faces/test/javaee8/ajax/Issue4115IT.java → .../faces/test/javaee8/ajax/Issue4115IT.java
@@ -38,7 +38,7 @@
 import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
-import ee.jakarta.tck.faces.test.htmlunit.IgnoringIncorrectnessListener;
+import ee.jakarta.tck.faces.test.htmlunit.htmlunit.IgnoringIncorrectnessListener;
 
 @RunWith(Arquillian.class)
 public class Issue4115IT {

diff --git a/...n/faces/test/javaee8/ajax/Spec1412IT.java → ...k/faces/test/javaee8/ajax/Spec1412IT.java b/...n/faces/test/javaee8/ajax/Spec1412IT.java → ...k/faces/test/javaee8/ajax/Spec1412IT.java
@@ -37,7 +37,7 @@
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
-import ee.jakarta.tck.faces.test.htmlunit.IgnoringIncorrectnessListener;
+import ee.jakarta.tck.faces.test.htmlunit.htmlunit.IgnoringIncorrectnessListener;
 
 @RunWith(Arquillian.class)
 public class Spec1412IT {

diff --git a/...n/faces/test/javaee8/ajax/Spec1423IT.java → ...k/faces/test/javaee8/ajax/Spec1423IT.java b/...n/faces/test/javaee8/ajax/Spec1423IT.java → ...k/faces/test/javaee8/ajax/Spec1423IT.java
@@ -38,7 +38,7 @@
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
-import ee.jakarta.tck.faces.test.htmlunit.IgnoringIncorrectnessListener;
+import ee.jakarta.tck.faces.test.htmlunit.htmlunit.IgnoringIncorrectnessListener;
 
 @RunWith(Arquillian.class)
 public class Spec1423IT {

diff --git a/...un/faces/test/javaee8/ajax/Spec790IT.java → ...ck/faces/test/javaee8/ajax/Spec790IT.java b/...un/faces/test/javaee8/ajax/Spec790IT.java → ...ck/faces/test/javaee8/ajax/Spec790IT.java
@@ -39,7 +39,7 @@
 import com.gargoylesoftware.htmlunit.html.HtmlInput;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
-import ee.jakarta.tck.faces.test.htmlunit.IgnoringIncorrectnessListener;
+import ee.jakarta.tck.faces.test.htmlunit.htmlunit.IgnoringIncorrectnessListener;
 
 @RunWith(Arquillian.class)
 public class Spec790IT {

diff --git a/...faces/test/javaee8/cdi/AnnotatedBean.java → ...faces/test/javaee8/cdi/AnnotatedBean.java b/...faces/test/javaee8/cdi/AnnotatedBean.java → ...faces/test/javaee8/cdi/AnnotatedBean.java
diff --git a/...ces/test/javaee8/cdi/AttributeFilter.java → ...ces/test/javaee8/cdi/AttributeFilter.java b/...ces/test/javaee8/cdi/AttributeFilter.java → ...ces/test/javaee8/cdi/AttributeFilter.java
diff --git a/...n/faces/test/javaee8/cdi/BackingBean.java → ...k/faces/test/javaee8/cdi/BackingBean.java b/...n/faces/test/javaee8/cdi/BackingBean.java → ...k/faces/test/javaee8/cdi/BackingBean.java
diff --git a/...un/faces/test/javaee8/cdi/BaseEntity.java → ...ck/faces/test/javaee8/cdi/BaseEntity.java b/...un/faces/test/javaee8/cdi/BaseEntity.java → ...ck/faces/test/javaee8/cdi/BaseEntity.java
diff --git a/...test/javaee8/cdi/BaseEntityConverter.java → ...test/javaee8/cdi/BaseEntityConverter.java b/...test/javaee8/cdi/BaseEntityConverter.java → ...test/javaee8/cdi/BaseEntityConverter.java
diff --git a/...s/test/javaee8/cdi/BaseEntityService.java → ...s/test/javaee8/cdi/BaseEntityService.java b/...s/test/javaee8/cdi/BaseEntityService.java → ...s/test/javaee8/cdi/BaseEntityService.java
diff --git a/...aces/test/javaee8/cdi/ConcreteEntity.java → ...aces/test/javaee8/cdi/ConcreteEntity.java b/...aces/test/javaee8/cdi/ConcreteEntity.java → ...aces/test/javaee8/cdi/ConcreteEntity.java
diff --git a/.../test/javaee8/cdi/ConcreteEntityBean.java → .../test/javaee8/cdi/ConcreteEntityBean.java b/.../test/javaee8/cdi/ConcreteEntityBean.java → .../test/javaee8/cdi/ConcreteEntityBean.java
diff --git a/...s/test/javaee8/cdi/ConfigurationBean.java → ...s/test/javaee8/cdi/ConfigurationBean.java b/...s/test/javaee8/cdi/ConfigurationBean.java → ...s/test/javaee8/cdi/ConfigurationBean.java
diff --git a/...un/faces/test/javaee8/cdi/CustomBean.java → ...ck/faces/test/javaee8/cdi/CustomBean.java b/...un/faces/test/javaee8/cdi/CustomBean.java → ...ck/faces/test/javaee8/cdi/CustomBean.java
diff --git a/...es/test/javaee8/cdi/CustomValidator1.java → ...es/test/javaee8/cdi/CustomValidator1.java b/...es/test/javaee8/cdi/CustomValidator1.java → ...es/test/javaee8/cdi/CustomValidator1.java
diff --git a/...es/test/javaee8/cdi/CustomValidator2.java → ...es/test/javaee8/cdi/CustomValidator2.java b/...es/test/javaee8/cdi/CustomValidator2.java → ...es/test/javaee8/cdi/CustomValidator2.java
diff --git a/...avaee8/cdi/InjectApplicationMap2Bean.java → ...avaee8/cdi/InjectApplicationMap2Bean.java b/...avaee8/cdi/InjectApplicationMap2Bean.java → ...avaee8/cdi/InjectApplicationMap2Bean.java
diff --git a/...javaee8/cdi/InjectApplicationMapBean.java → ...javaee8/cdi/InjectApplicationMapBean.java b/...javaee8/cdi/InjectApplicationMapBean.java → ...javaee8/cdi/InjectApplicationMapBean.java
diff --git a/...aces/test/javaee8/cdi/InjectBehavior.java → ...aces/test/javaee8/cdi/InjectBehavior.java b/...aces/test/javaee8/cdi/InjectBehavior.java → ...aces/test/javaee8/cdi/InjectBehavior.java
diff --git a/.../test/javaee8/cdi/InjectBehaviorBean.java → .../test/javaee8/cdi/InjectBehaviorBean.java b/.../test/javaee8/cdi/InjectBehaviorBean.java → .../test/javaee8/cdi/InjectBehaviorBean.java
diff --git a/...ces/test/javaee8/cdi/InjectConverter.java → ...ces/test/javaee8/cdi/InjectConverter.java b/...ces/test/javaee8/cdi/InjectConverter.java → ...ces/test/javaee8/cdi/InjectConverter.java
diff --git a/...es/test/javaee8/cdi/InjectConverter2.java → ...es/test/javaee8/cdi/InjectConverter2.java b/...es/test/javaee8/cdi/InjectConverter2.java → ...es/test/javaee8/cdi/InjectConverter2.java
diff --git a/...est/javaee8/cdi/InjectConverter2Bean.java → ...est/javaee8/cdi/InjectConverter2Bean.java b/...est/javaee8/cdi/InjectConverter2Bean.java → ...est/javaee8/cdi/InjectConverter2Bean.java
diff --git a/...est/javaee8/cdi/InjectConverter2Item.java → ...est/javaee8/cdi/InjectConverter2Item.java b/...est/javaee8/cdi/InjectConverter2Item.java → ...est/javaee8/cdi/InjectConverter2Item.java
diff --git a/...es/test/javaee8/cdi/InjectConverter3.java → ...es/test/javaee8/cdi/InjectConverter3.java b/...es/test/javaee8/cdi/InjectConverter3.java → ...es/test/javaee8/cdi/InjectConverter3.java
diff --git a/...est/javaee8/cdi/InjectConverter3Bean.java → ...est/javaee8/cdi/InjectConverter3Bean.java b/...est/javaee8/cdi/InjectConverter3Bean.java → ...est/javaee8/cdi/InjectConverter3Bean.java
diff --git a/...test/javaee8/cdi/InjectConverterBean.java → ...test/javaee8/cdi/InjectConverterBean.java b/...test/javaee8/cdi/InjectConverterBean.java → ...test/javaee8/cdi/InjectConverterBean.java
diff --git a/...avaee8/cdi/InjectExternalContextBean.java → ...avaee8/cdi/InjectExternalContextBean.java b/...avaee8/cdi/InjectExternalContextBean.java → ...avaee8/cdi/InjectExternalContextBean.java
diff --git a/...t/javaee8/cdi/InjectFacesContextBean.java → ...t/javaee8/cdi/InjectFacesContextBean.java b/...t/javaee8/cdi/InjectFacesContextBean.java → ...t/javaee8/cdi/InjectFacesContextBean.java
diff --git a/...ces/test/javaee8/cdi/InjectFlashBean.java → ...ces/test/javaee8/cdi/InjectFlashBean.java b/...ces/test/javaee8/cdi/InjectFlashBean.java → ...ces/test/javaee8/cdi/InjectFlashBean.java
diff --git a/...s/test/javaee8/cdi/InjectFlowMapBean.java → ...s/test/javaee8/cdi/InjectFlowMapBean.java b/...s/test/javaee8/cdi/InjectFlowMapBean.java → ...s/test/javaee8/cdi/InjectFlowMapBean.java
diff --git a/.../test/javaee8/cdi/InjectFlowMapBeanX.java → .../test/javaee8/cdi/InjectFlowMapBeanX.java b/.../test/javaee8/cdi/InjectFlowMapBeanX.java → .../test/javaee8/cdi/InjectFlowMapBeanX.java
diff --git a/...test/javaee8/cdi/InjectHeaderMapBean.java → ...test/javaee8/cdi/InjectHeaderMapBean.java b/...test/javaee8/cdi/InjectHeaderMapBean.java → ...test/javaee8/cdi/InjectHeaderMapBean.java
diff --git a/...avaee8/cdi/InjectHeaderValuesMapBean.java → ...avaee8/cdi/InjectHeaderValuesMapBean.java b/...avaee8/cdi/InjectHeaderValuesMapBean.java → ...avaee8/cdi/InjectHeaderValuesMapBean.java
diff --git a/...vaee8/cdi/InjectInitParameterMapBean.java → ...vaee8/cdi/InjectInitParameterMapBean.java b/...vaee8/cdi/InjectInitParameterMapBean.java → ...vaee8/cdi/InjectInitParameterMapBean.java
diff --git a/...avaee8/cdi/InjectManagedPropertyBean.java → ...avaee8/cdi/InjectManagedPropertyBean.java b/...avaee8/cdi/InjectManagedPropertyBean.java → ...avaee8/cdi/InjectManagedPropertyBean.java
diff --git a/...aee8/cdi/InjectRequestCookieMap2Bean.java → ...aee8/cdi/InjectRequestCookieMap2Bean.java b/...aee8/cdi/InjectRequestCookieMap2Bean.java → ...aee8/cdi/InjectRequestCookieMap2Bean.java
diff --git a/...vaee8/cdi/InjectRequestCookieMapBean.java → ...vaee8/cdi/InjectRequestCookieMapBean.java b/...vaee8/cdi/InjectRequestCookieMapBean.java → ...vaee8/cdi/InjectRequestCookieMapBean.java
diff --git a/...est/javaee8/cdi/InjectRequestMapBean.java → ...est/javaee8/cdi/InjectRequestMapBean.java b/...est/javaee8/cdi/InjectRequestMapBean.java → ...est/javaee8/cdi/InjectRequestMapBean.java
diff --git a/...e8/cdi/InjectRequestParameterMapBean.java → ...e8/cdi/InjectRequestParameterMapBean.java b/...e8/cdi/InjectRequestParameterMapBean.java → ...e8/cdi/InjectRequestParameterMapBean.java
diff --git a/.../InjectRequestParameterValuesMapBean.java → .../InjectRequestParameterValuesMapBean.java b/.../InjectRequestParameterValuesMapBean.java → .../InjectRequestParameterValuesMapBean.java
diff --git a/...avaee8/cdi/InjectResourceHandlerBean.java → ...avaee8/cdi/InjectResourceHandlerBean.java b/...avaee8/cdi/InjectResourceHandlerBean.java → ...avaee8/cdi/InjectResourceHandlerBean.java
diff --git a/...s/test/javaee8/cdi/InjectSessionBean.java → ...s/test/javaee8/cdi/InjectSessionBean.java b/...s/test/javaee8/cdi/InjectSessionBean.java → ...s/test/javaee8/cdi/InjectSessionBean.java
diff --git a/...st/javaee8/cdi/InjectSessionMap2Bean.java → ...st/javaee8/cdi/InjectSessionMap2Bean.java b/...st/javaee8/cdi/InjectSessionMap2Bean.java → ...st/javaee8/cdi/InjectSessionMap2Bean.java
diff --git a/...est/javaee8/cdi/InjectSessionMapBean.java → ...est/javaee8/cdi/InjectSessionMapBean.java b/...est/javaee8/cdi/InjectSessionMapBean.java → ...est/javaee8/cdi/InjectSessionMapBean.java
diff --git a/...ces/test/javaee8/cdi/InjectValidator.java → ...ces/test/javaee8/cdi/InjectValidator.java b/...ces/test/javaee8/cdi/InjectValidator.java → ...ces/test/javaee8/cdi/InjectValidator.java
diff --git a/...test/javaee8/cdi/InjectValidatorBean.java → ...test/javaee8/cdi/InjectValidatorBean.java b/...test/javaee8/cdi/InjectValidatorBean.java → ...test/javaee8/cdi/InjectValidatorBean.java
diff --git a/...aces/test/javaee8/cdi/InjectViewBean.java → ...aces/test/javaee8/cdi/InjectViewBean.java b/...aces/test/javaee8/cdi/InjectViewBean.java → ...aces/test/javaee8/cdi/InjectViewBean.java
diff --git a/.../test/javaee8/cdi/InjectViewMap2Bean.java → .../test/javaee8/cdi/InjectViewMap2Bean.java b/.../test/javaee8/cdi/InjectViewMap2Bean.java → .../test/javaee8/cdi/InjectViewMap2Bean.java
diff --git a/...s/test/javaee8/cdi/InjectViewMapBean.java → ...s/test/javaee8/cdi/InjectViewMapBean.java b/...s/test/javaee8/cdi/InjectViewMapBean.java → ...s/test/javaee8/cdi/InjectViewMapBean.java
diff --git a/...test/javaee8/cdi/ManagedPropertyBean.java → ...test/javaee8/cdi/ManagedPropertyBean.java b/...test/javaee8/cdi/ManagedPropertyBean.java → ...test/javaee8/cdi/ManagedPropertyBean.java
diff --git a/...n/faces/test/javaee8/cdi/Issue3722IT.java → ...k/faces/test/javaee8/cdi/Issue3722IT.java b/...n/faces/test/javaee8/cdi/Issue3722IT.java → ...k/faces/test/javaee8/cdi/Issue3722IT.java
diff --git a/...n/faces/test/javaee8/cdi/Issue3729IT.java → ...k/faces/test/javaee8/cdi/Issue3729IT.java b/...n/faces/test/javaee8/cdi/Issue3729IT.java → ...k/faces/test/javaee8/cdi/Issue3729IT.java
diff --git a/...n/faces/test/javaee8/cdi/Issue3730IT.java → ...k/faces/test/javaee8/cdi/Issue3730IT.java b/...n/faces/test/javaee8/cdi/Issue3730IT.java → ...k/faces/test/javaee8/cdi/Issue3730IT.java
diff --git a/...n/faces/test/javaee8/cdi/Issue3731IT.java → ...k/faces/test/javaee8/cdi/Issue3731IT.java b/...n/faces/test/javaee8/cdi/Issue3731IT.java → ...k/faces/test/javaee8/cdi/Issue3731IT.java
diff --git a/...n/faces/test/javaee8/cdi/Issue3793IT.java → ...k/faces/test/javaee8/cdi/Issue3793IT.java b/...n/faces/test/javaee8/cdi/Issue3793IT.java → ...k/faces/test/javaee8/cdi/Issue3793IT.java
diff --git a/...n/faces/test/javaee8/cdi/Issue4324IT.java → ...k/faces/test/javaee8/cdi/Issue4324IT.java b/...n/faces/test/javaee8/cdi/Issue4324IT.java → ...k/faces/test/javaee8/cdi/Issue4324IT.java
diff --git a/...n/faces/test/javaee8/cdi/Issue4551IT.java → ...k/faces/test/javaee8/cdi/Issue4551IT.java b/...n/faces/test/javaee8/cdi/Issue4551IT.java → ...k/faces/test/javaee8/cdi/Issue4551IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1309IT.java → ...ck/faces/test/javaee8/cdi/Spec1309IT.java b/...un/faces/test/javaee8/cdi/Spec1309IT.java → ...ck/faces/test/javaee8/cdi/Spec1309IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1323IT.java → ...ck/faces/test/javaee8/cdi/Spec1323IT.java b/...un/faces/test/javaee8/cdi/Spec1323IT.java → ...ck/faces/test/javaee8/cdi/Spec1323IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1327IT.java → ...ck/faces/test/javaee8/cdi/Spec1327IT.java b/...un/faces/test/javaee8/cdi/Spec1327IT.java → ...ck/faces/test/javaee8/cdi/Spec1327IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1333IT.java → ...ck/faces/test/javaee8/cdi/Spec1333IT.java b/...un/faces/test/javaee8/cdi/Spec1333IT.java → ...ck/faces/test/javaee8/cdi/Spec1333IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1335IT.java → ...ck/faces/test/javaee8/cdi/Spec1335IT.java b/...un/faces/test/javaee8/cdi/Spec1335IT.java → ...ck/faces/test/javaee8/cdi/Spec1335IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1345IT.java → ...ck/faces/test/javaee8/cdi/Spec1345IT.java b/...un/faces/test/javaee8/cdi/Spec1345IT.java → ...ck/faces/test/javaee8/cdi/Spec1345IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1349IT.java → ...ck/faces/test/javaee8/cdi/Spec1349IT.java b/...un/faces/test/javaee8/cdi/Spec1349IT.java → ...ck/faces/test/javaee8/cdi/Spec1349IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1350IT.java → ...ck/faces/test/javaee8/cdi/Spec1350IT.java b/...un/faces/test/javaee8/cdi/Spec1350IT.java → ...ck/faces/test/javaee8/cdi/Spec1350IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1351IT.java → ...ck/faces/test/javaee8/cdi/Spec1351IT.java b/...un/faces/test/javaee8/cdi/Spec1351IT.java → ...ck/faces/test/javaee8/cdi/Spec1351IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1353IT.java → ...ck/faces/test/javaee8/cdi/Spec1353IT.java b/...un/faces/test/javaee8/cdi/Spec1353IT.java → ...ck/faces/test/javaee8/cdi/Spec1353IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1385IT.java → ...ck/faces/test/javaee8/cdi/Spec1385IT.java b/...un/faces/test/javaee8/cdi/Spec1385IT.java → ...ck/faces/test/javaee8/cdi/Spec1385IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1386IT.java → ...ck/faces/test/javaee8/cdi/Spec1386IT.java b/...un/faces/test/javaee8/cdi/Spec1386IT.java → ...ck/faces/test/javaee8/cdi/Spec1386IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1387IT.java → ...ck/faces/test/javaee8/cdi/Spec1387IT.java b/...un/faces/test/javaee8/cdi/Spec1387IT.java → ...ck/faces/test/javaee8/cdi/Spec1387IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1388IT.java → ...ck/faces/test/javaee8/cdi/Spec1388IT.java b/...un/faces/test/javaee8/cdi/Spec1388IT.java → ...ck/faces/test/javaee8/cdi/Spec1388IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1389IT.java → ...ck/faces/test/javaee8/cdi/Spec1389IT.java b/...un/faces/test/javaee8/cdi/Spec1389IT.java → ...ck/faces/test/javaee8/cdi/Spec1389IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1390IT.java → ...ck/faces/test/javaee8/cdi/Spec1390IT.java b/...un/faces/test/javaee8/cdi/Spec1390IT.java → ...ck/faces/test/javaee8/cdi/Spec1390IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1391IT.java → ...ck/faces/test/javaee8/cdi/Spec1391IT.java b/...un/faces/test/javaee8/cdi/Spec1391IT.java → ...ck/faces/test/javaee8/cdi/Spec1391IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1393IT.java → ...ck/faces/test/javaee8/cdi/Spec1393IT.java b/...un/faces/test/javaee8/cdi/Spec1393IT.java → ...ck/faces/test/javaee8/cdi/Spec1393IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1394IT.java → ...ck/faces/test/javaee8/cdi/Spec1394IT.java b/...un/faces/test/javaee8/cdi/Spec1394IT.java → ...ck/faces/test/javaee8/cdi/Spec1394IT.java
diff --git a/...un/faces/test/javaee8/cdi/Spec1418IT.java → ...ck/faces/test/javaee8/cdi/Spec1418IT.java b/...un/faces/test/javaee8/cdi/Spec1418IT.java → ...ck/faces/test/javaee8/cdi/Spec1418IT.java
diff --git a/...sun/faces/test/javaee8/cdi/Spec527IT.java → ...tck/faces/test/javaee8/cdi/Spec527IT.java b/...sun/faces/test/javaee8/cdi/Spec527IT.java → ...tck/faces/test/javaee8/cdi/Spec527IT.java
diff --git a/...s/test/javaee8/commandScript/Spec613.java → ...s/test/javaee8/commandScript/Spec613.java b/...s/test/javaee8/commandScript/Spec613.java → ...s/test/javaee8/commandScript/Spec613.java
diff --git a/...test/javaee8/commandScript/Spec613IT.java → ...test/javaee8/commandScript/Spec613IT.java b/...test/javaee8/commandScript/Spec613IT.java → ...test/javaee8/commandScript/Spec613IT.java
diff --git a/...s/test/javaee8/converter/BackingBean.java → ...s/test/javaee8/converter/BackingBean.java b/...s/test/javaee8/converter/BackingBean.java → ...s/test/javaee8/converter/BackingBean.java
diff --git a/...s/test/javaee8/converter/Issue4070IT.java → ...s/test/javaee8/converter/Issue4070IT.java b/...s/test/javaee8/converter/Issue4070IT.java → ...s/test/javaee8/converter/Issue4070IT.java
diff --git a/...s/test/javaee8/converter/Issue4087IT.java → ...s/test/javaee8/converter/Issue4087IT.java b/...s/test/javaee8/converter/Issue4087IT.java → ...s/test/javaee8/converter/Issue4087IT.java
diff --git a/...s/test/javaee8/converter/Issue4110IT.java → ...s/test/javaee8/converter/Issue4110IT.java b/...s/test/javaee8/converter/Issue4110IT.java → ...s/test/javaee8/converter/Issue4110IT.java
diff --git a/...n/faces/test/servlet40/el/Spec1337IT.java → ...k/faces/test/servlet40/el/Spec1337IT.java b/...n/faces/test/servlet40/el/Spec1337IT.java → ...k/faces/test/servlet40/el/Spec1337IT.java
diff --git a/...vlet40/exactmapping/ExactMappingBean.java → ...vlet40/exactmapping/ExactMappingBean.java b/...vlet40/exactmapping/ExactMappingBean.java → ...vlet40/exactmapping/ExactMappingBean.java
diff --git a/...st/servlet40/exactmapping/Spec1260IT.java → ...st/servlet40/exactmapping/Spec1260IT.java b/...st/servlet40/exactmapping/Spec1260IT.java → ...st/servlet40/exactmapping/Spec1260IT.java
diff --git a/.../faceletCacheFactory/MDSFaceletCache.java → .../faceletCacheFactory/MDSFaceletCache.java b/.../faceletCacheFactory/MDSFaceletCache.java → .../faceletCacheFactory/MDSFaceletCache.java
diff --git a/...tCacheFactory/MDSFaceletCacheFactory.java → ...tCacheFactory/MDSFaceletCacheFactory.java b/...tCacheFactory/MDSFaceletCacheFactory.java → ...tCacheFactory/MDSFaceletCacheFactory.java
diff --git a/...et40/faceletCacheFactory/Issue3755IT.java → ...et40/faceletCacheFactory/Issue3755IT.java b/...et40/faceletCacheFactory/Issue3755IT.java → ...et40/faceletCacheFactory/Issue3755IT.java
diff --git a/...st/servlet40/facelets/CollectionBean.java → ...st/servlet40/facelets/CollectionBean.java b/...st/servlet40/facelets/CollectionBean.java → ...st/servlet40/facelets/CollectionBean.java
diff --git a/...test/servlet40/facelets/IterableBean.java → ...test/servlet40/facelets/IterableBean.java b/...test/servlet40/facelets/IterableBean.java → ...test/servlet40/facelets/IterableBean.java
diff --git a/...aces/test/servlet40/facelets/MapBean.java → ...aces/test/servlet40/facelets/MapBean.java b/...aces/test/servlet40/facelets/MapBean.java → ...aces/test/servlet40/facelets/MapBean.java
diff --git a/...s/test/servlet40/facelets/Spec1103IT.java → ...s/test/servlet40/facelets/Spec1103IT.java b/...s/test/servlet40/facelets/Spec1103IT.java → ...s/test/servlet40/facelets/Spec1103IT.java
diff --git a/...s/test/servlet40/facelets/Spec1364IT.java → ...s/test/servlet40/facelets/Spec1364IT.java b/...s/test/servlet40/facelets/Spec1364IT.java → ...s/test/servlet40/facelets/Spec1364IT.java
diff --git a/...e8/facesConverter/Issue4913Converter.java → ...e8/facesConverter/Issue4913Converter.java b/...e8/facesConverter/Issue4913Converter.java → ...e8/facesConverter/Issue4913Converter.java
diff --git a/...t/javaee8/facesConverter/Issue4913IT.java → ...t/javaee8/facesConverter/Issue4913IT.java b/...t/javaee8/facesConverter/Issue4913IT.java → ...t/javaee8/facesConverter/Issue4913IT.java
diff --git a/...vlet40/getviews/GetViewResourcesBean.java → ...vlet40/getviews/GetViewResourcesBean.java b/...vlet40/getviews/GetViewResourcesBean.java → ...vlet40/getviews/GetViewResourcesBean.java
diff --git a/...test/servlet40/getviews/GetViewsBean.java → ...test/servlet40/getviews/GetViewsBean.java b/...test/servlet40/getviews/GetViewsBean.java → ...test/servlet40/getviews/GetViewsBean.java
diff --git a/...s/test/servlet40/getviews/Spec1435IT.java → ...s/test/servlet40/getviews/Spec1435IT.java b/...s/test/servlet40/getviews/Spec1435IT.java → ...s/test/servlet40/getviews/Spec1435IT.java
diff --git a/...avaee8/namespacedView/NamespacedView.java → ...avaee8/namespacedView/NamespacedView.java b/...avaee8/namespacedView/NamespacedView.java → ...avaee8/namespacedView/NamespacedView.java
diff --git a/...acedView/Spec790WithNamespacedViewIT.java → ...acedView/Spec790WithNamespacedViewIT.java b/...acedView/Spec790WithNamespacedViewIT.java → ...acedView/Spec790WithNamespacedViewIT.java
diff --git a/...test/javaee8/passthrough/Issue4093IT.java → ...test/javaee8/passthrough/Issue4093IT.java b/...test/javaee8/passthrough/Issue4093IT.java → ...test/javaee8/passthrough/Issue4093IT.java
diff --git a/...pression/CustomSearchKeywordResolver.java → ...pression/CustomSearchKeywordResolver.java b/...pression/CustomSearchKeywordResolver.java → ...pression/CustomSearchKeywordResolver.java
diff --git a/...st/javaee8/searchExpression/Spec1238.java → ...st/javaee8/searchExpression/Spec1238.java b/...st/javaee8/searchExpression/Spec1238.java → ...st/javaee8/searchExpression/Spec1238.java
diff --git a/...javaee8/searchExpression/Issue4331IT.java → ...javaee8/searchExpression/Issue4331IT.java b/...javaee8/searchExpression/Issue4331IT.java → ...javaee8/searchExpression/Issue4331IT.java
diff --git a/.../javaee8/searchExpression/Spec1238IT.java → .../javaee8/searchExpression/Spec1238IT.java b/.../javaee8/searchExpression/Spec1238IT.java → .../javaee8/searchExpression/Spec1238IT.java
diff --git a/.../systemevent/PostRenderViewEventBean.java → .../systemevent/PostRenderViewEventBean.java b/.../systemevent/PostRenderViewEventBean.java → .../systemevent/PostRenderViewEventBean.java
diff --git a/...est/servlet40/systemevent/Spec1135IT.java → ...est/servlet40/systemevent/Spec1135IT.java b/...est/servlet40/systemevent/Spec1135IT.java → ...est/servlet40/systemevent/Spec1135IT.java
diff --git a/...avaee8/validateWholeBean/BackingBean.java → ...avaee8/validateWholeBean/BackingBean.java b/...avaee8/validateWholeBean/BackingBean.java → ...avaee8/validateWholeBean/BackingBean.java
diff --git a/...t/javaee8/validateWholeBean/Password.java → ...t/javaee8/validateWholeBean/Password.java b/...t/javaee8/validateWholeBean/Password.java → ...t/javaee8/validateWholeBean/Password.java
diff --git a/...ateWholeBean/PasswordValidationGroup.java → ...ateWholeBean/PasswordValidationGroup.java b/...ateWholeBean/PasswordValidationGroup.java → ...ateWholeBean/PasswordValidationGroup.java
diff --git a/.../validateWholeBean/PasswordValidator.java → .../validateWholeBean/PasswordValidator.java b/.../validateWholeBean/PasswordValidator.java → .../validateWholeBean/PasswordValidator.java
diff --git a/.../test/javaee8/validateWholeBean/User.java → .../test/javaee8/validateWholeBean/User.java b/.../test/javaee8/validateWholeBean/User.java → .../test/javaee8/validateWholeBean/User.java
diff --git a/...vaee8/validateWholeBean/UserPassword.java → ...vaee8/validateWholeBean/UserPassword.java b/...vaee8/validateWholeBean/UserPassword.java → ...vaee8/validateWholeBean/UserPassword.java
diff --git a/...idateWholeBean/UserPasswordValidator.java → ...idateWholeBean/UserPasswordValidator.java b/...idateWholeBean/UserPasswordValidator.java → ...idateWholeBean/UserPasswordValidator.java
diff --git a/...avaee8/validateWholeBean/Issue4083IT.java → ...avaee8/validateWholeBean/Issue4083IT.java b/...avaee8/validateWholeBean/Issue4083IT.java → ...avaee8/validateWholeBean/Issue4083IT.java
diff --git a/...avaee8/validateWholeBean/Issue4313IT.java → ...avaee8/validateWholeBean/Issue4313IT.java b/...avaee8/validateWholeBean/Issue4313IT.java → ...avaee8/validateWholeBean/Issue4313IT.java
diff --git a/...ces/test/javaee8/websocket/Issue4332.java → ...ces/test/javaee8/websocket/Issue4332.java b/...ces/test/javaee8/websocket/Issue4332.java → ...ces/test/javaee8/websocket/Issue4332.java
diff --git a/...aces/test/javaee8/websocket/Spec1396.java → ...aces/test/javaee8/websocket/Spec1396.java b/...aces/test/javaee8/websocket/Spec1396.java → ...aces/test/javaee8/websocket/Spec1396.java
diff --git a/...s/test/javaee8/websocket/Issue4332IT.java → ...s/test/javaee8/websocket/Issue4332IT.java b/...s/test/javaee8/websocket/Issue4332IT.java → ...s/test/javaee8/websocket/Issue4332IT.java
diff --git a/...es/test/javaee8/websocket/Spec1396IT.java → ...es/test/javaee8/websocket/Spec1396IT.java b/...es/test/javaee8/websocket/Spec1396IT.java → ...es/test/javaee8/websocket/Spec1396IT.java
diff --git a/...letbydefault/XhtmlMappingToFaceletIT.java → ...letbydefault/XhtmlMappingToFaceletIT.java b/...letbydefault/XhtmlMappingToFaceletIT.java → ...letbydefault/XhtmlMappingToFaceletIT.java
diff --git a/...aces/test/servlet50/ajax/Issue5032IT.java → ...aces/test/servlet50/ajax/Issue5032IT.java b/...aces/test/servlet50/ajax/Issue5032IT.java → ...aces/test/servlet50/ajax/Issue5032IT.java
diff --git a/...faces/test/servlet50/ajax/Spec1567IT.java → ...faces/test/servlet50/ajax/Spec1567IT.java b/...faces/test/servlet50/ajax/Spec1567IT.java → ...faces/test/servlet50/ajax/Spec1567IT.java
diff --git a/...ces/test/javaee8/cdi/AttributeFilter.java → ...ces/test/javaee8/cdi/AttributeFilter.java b/...ces/test/javaee8/cdi/AttributeFilter.java → ...ces/test/javaee8/cdi/AttributeFilter.java
diff --git a/...avaee8/cdi/InjectApplicationMap2Bean.java → ...avaee8/cdi/InjectApplicationMap2Bean.java b/...avaee8/cdi/InjectApplicationMap2Bean.java → ...avaee8/cdi/InjectApplicationMap2Bean.java
diff --git a/...javaee8/cdi/InjectApplicationMapBean.java → ...javaee8/cdi/InjectApplicationMapBean.java b/...javaee8/cdi/InjectApplicationMapBean.java → ...javaee8/cdi/InjectApplicationMapBean.java
diff --git a/...test/javaee8/cdi/InjectHeaderMapBean.java → ...test/javaee8/cdi/InjectHeaderMapBean.java b/...test/javaee8/cdi/InjectHeaderMapBean.java → ...test/javaee8/cdi/InjectHeaderMapBean.java
diff --git a/...avaee8/cdi/InjectHeaderValuesMapBean.java → ...avaee8/cdi/InjectHeaderValuesMapBean.java b/...avaee8/cdi/InjectHeaderValuesMapBean.java → ...avaee8/cdi/InjectHeaderValuesMapBean.java
diff --git a/...vaee8/cdi/InjectInitParameterMapBean.java → ...vaee8/cdi/InjectInitParameterMapBean.java b/...vaee8/cdi/InjectInitParameterMapBean.java → ...vaee8/cdi/InjectInitParameterMapBean.java
diff --git a/...aee8/cdi/InjectRequestCookieMap2Bean.java → ...aee8/cdi/InjectRequestCookieMap2Bean.java b/...aee8/cdi/InjectRequestCookieMap2Bean.java → ...aee8/cdi/InjectRequestCookieMap2Bean.java
diff --git a/...vaee8/cdi/InjectRequestCookieMapBean.java → ...vaee8/cdi/InjectRequestCookieMapBean.java b/...vaee8/cdi/InjectRequestCookieMapBean.java → ...vaee8/cdi/InjectRequestCookieMapBean.java
diff --git a/...est/javaee8/cdi/InjectRequestMapBean.java → ...est/javaee8/cdi/InjectRequestMapBean.java b/...est/javaee8/cdi/InjectRequestMapBean.java → ...est/javaee8/cdi/InjectRequestMapBean.java
diff --git a/...e8/cdi/InjectRequestParameterMapBean.java → ...e8/cdi/InjectRequestParameterMapBean.java b/...e8/cdi/InjectRequestParameterMapBean.java → ...e8/cdi/InjectRequestParameterMapBean.java
diff --git a/.../InjectRequestParameterValuesMapBean.java → .../InjectRequestParameterValuesMapBean.java b/.../InjectRequestParameterValuesMapBean.java → .../InjectRequestParameterValuesMapBean.java
diff --git a/.../test/javaee8/cdi/InjectViewMap2Bean.java → .../test/javaee8/cdi/InjectViewMap2Bean.java b/.../test/javaee8/cdi/InjectViewMap2Bean.java → .../test/javaee8/cdi/InjectViewMap2Bean.java
diff --git a/...s/test/javaee8/cdi/InjectViewMapBean.java → ...s/test/javaee8/cdi/InjectViewMapBean.java b/...s/test/javaee8/cdi/InjectViewMapBean.java → ...s/test/javaee8/cdi/InjectViewMapBean.java
diff --git a/...avaee8/cdi/Spec1582ApplicationMap2IT.java → ...avaee8/cdi/Spec1582ApplicationMap2IT.java b/...avaee8/cdi/Spec1582ApplicationMap2IT.java → ...avaee8/cdi/Spec1582ApplicationMap2IT.java
diff --git a/...javaee8/cdi/Spec1582ApplicationMapIT.java → ...javaee8/cdi/Spec1582ApplicationMapIT.java b/...javaee8/cdi/Spec1582ApplicationMapIT.java → ...javaee8/cdi/Spec1582ApplicationMapIT.java
diff --git a/...test/javaee8/cdi/Spec1582HeaderMapIT.java → ...test/javaee8/cdi/Spec1582HeaderMapIT.java b/...test/javaee8/cdi/Spec1582HeaderMapIT.java → ...test/javaee8/cdi/Spec1582HeaderMapIT.java
diff --git a/...avaee8/cdi/Spec1582HeaderValuesMapIT.java → ...avaee8/cdi/Spec1582HeaderValuesMapIT.java b/...avaee8/cdi/Spec1582HeaderValuesMapIT.java → ...avaee8/cdi/Spec1582HeaderValuesMapIT.java
diff --git a/...vaee8/cdi/Spec1582InitParameterMapIT.java → ...vaee8/cdi/Spec1582InitParameterMapIT.java b/...vaee8/cdi/Spec1582InitParameterMapIT.java → ...vaee8/cdi/Spec1582InitParameterMapIT.java
diff --git a/...aee8/cdi/Spec1582RequestCookieMap2IT.java → ...aee8/cdi/Spec1582RequestCookieMap2IT.java b/...aee8/cdi/Spec1582RequestCookieMap2IT.java → ...aee8/cdi/Spec1582RequestCookieMap2IT.java
diff --git a/...vaee8/cdi/Spec1582RequestCookieMapIT.java → ...vaee8/cdi/Spec1582RequestCookieMapIT.java b/...vaee8/cdi/Spec1582RequestCookieMapIT.java → ...vaee8/cdi/Spec1582RequestCookieMapIT.java
diff --git a/...est/javaee8/cdi/Spec1582RequestMapIT.java → ...est/javaee8/cdi/Spec1582RequestMapIT.java b/...est/javaee8/cdi/Spec1582RequestMapIT.java → ...est/javaee8/cdi/Spec1582RequestMapIT.java
diff --git a/...e8/cdi/Spec1582RequestParameterMapIT.java → ...e8/cdi/Spec1582RequestParameterMapIT.java b/...e8/cdi/Spec1582RequestParameterMapIT.java → ...e8/cdi/Spec1582RequestParameterMapIT.java
diff --git a/...Spec1582RequestParametersValuesMapIT.java → ...Spec1582RequestParametersValuesMapIT.java b/...Spec1582RequestParametersValuesMapIT.java → ...Spec1582RequestParametersValuesMapIT.java
diff --git a/.../test/javaee8/cdi/Spec1582ViewMap2IT.java → .../test/javaee8/cdi/Spec1582ViewMap2IT.java b/.../test/javaee8/cdi/Spec1582ViewMap2IT.java → .../test/javaee8/cdi/Spec1582ViewMap2IT.java
diff --git a/...s/test/javaee8/cdi/Spec1582ViewMapIT.java → ...s/test/javaee8/cdi/Spec1582ViewMapIT.java b/...s/test/javaee8/cdi/Spec1582ViewMapIT.java → ...s/test/javaee8/cdi/Spec1582ViewMapIT.java
diff --git a/...es/test/servlet50/doctype/Spec1568IT.java → ...es/test/servlet50/doctype/Spec1568IT.java b/...es/test/servlet50/doctype/Spec1568IT.java → ...es/test/servlet50/doctype/Spec1568IT.java
diff --git a/...t/servlet50/inputfile/Spec1555ITBean.java → ...t/servlet50/inputfile/Spec1555ITBean.java b/...t/servlet50/inputfile/Spec1555ITBean.java → ...t/servlet50/inputfile/Spec1555ITBean.java
diff --git a/.../test/servlet50/inputfile/Spec1555IT.java → .../test/servlet50/inputfile/Spec1555IT.java b/.../test/servlet50/inputfile/Spec1555IT.java → .../test/servlet50/inputfile/Spec1555IT.java
diff --git a/.../test/servlet50/inputfile/Spec1556IT.java → .../test/servlet50/inputfile/Spec1556IT.java b/.../test/servlet50/inputfile/Spec1556IT.java → .../test/servlet50/inputfile/Spec1556IT.java
diff --git a/.../test/servlet50/inputtext/Spec1560IT.java → .../test/servlet50/inputtext/Spec1560IT.java b/.../test/servlet50/inputtext/Spec1560IT.java → .../test/servlet50/inputtext/Spec1560IT.java
diff --git a/...n/faces/test/faces40/javapages/Hello.java → ...k/faces/test/faces40/javapages/Hello.java b/...n/faces/test/faces40/javapages/Hello.java → ...k/faces/test/faces40/javapages/Hello.java
diff --git a/...es/test/faces40/javapages/Spec1581IT.java → ...es/test/faces40/javapages/Spec1581IT.java b/...es/test/faces40/javapages/Spec1581IT.java → ...es/test/faces40/javapages/Spec1581IT.java
@@ -35,7 +35,7 @@
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlInput;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import ee.jakarta.tck.faces.test.htmlunit.DebugOptions;
+import ee.jakarta.tck.faces.test.htmlunit.htmlunit.DebugOptions;
 
 @RunWith(Arquillian.class)
 public class Spec1581IT {

diff --git a/...st/faces40/javapagewithmetadata/Bean.java → ...st/faces40/javapagewithmetadata/Bean.java b/...st/faces40/javapagewithmetadata/Bean.java → ...st/faces40/javapagewithmetadata/Bean.java
diff --git a/...t/faces40/javapagewithmetadata/Hello.java → ...t/faces40/javapagewithmetadata/Hello.java b/...t/faces40/javapagewithmetadata/Hello.java → ...t/faces40/javapagewithmetadata/Hello.java
diff --git a/...es40/javapagewithmetadata/Spec1581IT.java → ...es40/javapagewithmetadata/Spec1581IT.java b/...es40/javapagewithmetadata/Spec1581IT.java → ...es40/javapagewithmetadata/Spec1581IT.java
@@ -35,7 +35,7 @@
 
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import ee.jakarta.tck.faces.test.htmlunit.DebugOptions;
+import ee.jakarta.tck.faces.test.htmlunit.htmlunit.DebugOptions;
 
 @RunWith(Arquillian.class)
 public class Spec1581IT {

diff --git a/...servlet50/namespaces/CustomComponent.java → ...servlet50/namespaces/CustomComponent.java b/...servlet50/namespaces/CustomComponent.java → ...servlet50/namespaces/CustomComponent.java
diff --git a/...test/servlet50/namespaces/Spec1553IT.java → ...test/servlet50/namespaces/Spec1553IT.java b/...test/servlet50/namespaces/Spec1553IT.java → ...test/servlet50/namespaces/Spec1553IT.java
diff --git a/.../test/servlet50/resources/Spec1565IT.java → .../test/servlet50/resources/Spec1565IT.java b/.../test/servlet50/resources/Spec1565IT.java → .../test/servlet50/resources/Spec1565IT.java
diff --git a/...t/servlet50/selectitemgroup/Category.java → ...t/servlet50/selectitemgroup/Category.java b/...t/servlet50/selectitemgroup/Category.java → ...t/servlet50/selectitemgroup/Category.java
diff --git a/...st/servlet50/selectitemgroup/Product.java → ...st/servlet50/selectitemgroup/Product.java b/...st/servlet50/selectitemgroup/Product.java → ...st/servlet50/selectitemgroup/Product.java
diff --git a/...let50/selectitemgroup/Spec1563ITBean.java → ...let50/selectitemgroup/Spec1563ITBean.java b/...let50/selectitemgroup/Spec1563ITBean.java → ...let50/selectitemgroup/Spec1563ITBean.java
diff --git a/...servlet50/selectitemgroup/Spec1563IT.java → ...servlet50/selectitemgroup/Spec1563IT.java b/...servlet50/selectitemgroup/Spec1563IT.java → ...servlet50/selectitemgroup/Spec1563IT.java
diff --git a/.../servlet50/selectitemgroups/Category.java → .../servlet50/selectitemgroups/Category.java b/.../servlet50/selectitemgroups/Category.java → .../servlet50/selectitemgroups/Category.java
diff --git a/...t/servlet50/selectitemgroups/Product.java → ...t/servlet50/selectitemgroups/Product.java b/...t/servlet50/selectitemgroups/Product.java → ...t/servlet50/selectitemgroups/Product.java
diff --git a/...et50/selectitemgroups/Spec1559ITBean.java → ...et50/selectitemgroups/Spec1559ITBean.java b/...et50/selectitemgroups/Spec1559ITBean.java → ...et50/selectitemgroups/Spec1559ITBean.java
diff --git a/...ervlet50/selectitemgroups/Spec1559IT.java → ...ervlet50/selectitemgroups/Spec1559IT.java b/...ervlet50/selectitemgroups/Spec1559IT.java → ...ervlet50/selectitemgroups/Spec1559IT.java
diff --git a/...ervlet50/selectmanycheckbox/Category.java → ...ervlet50/selectmanycheckbox/Category.java b/...ervlet50/selectmanycheckbox/Category.java → ...ervlet50/selectmanycheckbox/Category.java
diff --git a/...servlet50/selectmanycheckbox/Product.java → ...servlet50/selectmanycheckbox/Product.java b/...servlet50/selectmanycheckbox/Product.java → ...servlet50/selectmanycheckbox/Product.java
diff --git a/...50/selectmanycheckbox/Spec1574ITBean.java → ...50/selectmanycheckbox/Spec1574ITBean.java b/...50/selectmanycheckbox/Spec1574ITBean.java → ...50/selectmanycheckbox/Spec1574ITBean.java
diff --git a/...vlet50/selectmanycheckbox/Spec1574IT.java → ...vlet50/selectmanycheckbox/Spec1574IT.java b/...vlet50/selectmanycheckbox/Spec1574IT.java → ...vlet50/selectmanycheckbox/Spec1574IT.java
diff --git a/tck/pom.xml b/tck/pom.xml
@@ -47,7 +47,7 @@
         <skipTests>false</skipTests>
 
         <!-- Application Server versions (these are downloaded and installed in these versions by Maven for the CI profiles) -->
-        <glassfish.version>7.0.0-M1</glassfish.version>
+        <glassfish.version>7.0.0-SNAPSHOT</glassfish.version>
         <tomcat.version>9.0.12</tomcat.version>
     </properties>
 
@@ -284,14 +284,16 @@
                 <configuration>
                     <aggregate>true</aggregate>
                     <linkXRef>true</linkXRef>
-                    <trimStackTrace>false</trimStackTrace>
-                    <argLine>-XX:+ShowCodeDetailsInExceptionMessages</argLine>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0-M4</version>
+                <configuration>
+                    <trimStackTrace>false</trimStackTrace>
+                    <argLine>-XX:+ShowCodeDetailsInExceptionMessages</argLine>
+                </configuration>
                 <dependencies>
                     <dependency>
                         <groupId>javax.annotation</groupId>

diff --git a/...sun/faces/test/htmlunit/DebugOptions.java → .../test/htmlunit/htmlunit/DebugOptions.java b/...sun/faces/test/htmlunit/DebugOptions.java → .../test/htmlunit/htmlunit/DebugOptions.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.htmlunit;
+package ee.jakarta.tck.faces.test.htmlunit.htmlunit;
 
 import com.gargoylesoftware.htmlunit.WebClient;
 

diff --git a/...mlunit/IgnoringIncorrectnessListener.java → ...mlunit/IgnoringIncorrectnessListener.java b/...mlunit/IgnoringIncorrectnessListener.java → ...mlunit/IgnoringIncorrectnessListener.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package ee.jakarta.tck.faces.test.htmlunit;
+package ee.jakarta.tck.faces.test.htmlunit.htmlunit;
 
 import com.gargoylesoftware.htmlunit.IncorrectnessListener;