Rename packages from plural to singular.

api/pom.xml

@@ -85,21 +85,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- We need to bind a new execution of this to run after provisioning is done so the module.xml file
-                 required for testing is not deleted.
-            -->
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-module</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>testResources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>

api/src/main/java/org/wildfly/testing/junit/annotations/AnyOf.java → api/src/main/java/org/wildfly/testing/junit/annotation/AnyOf.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.wildfly.testing.junit.annotations;
+package org.wildfly.testing.junit.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

api/src/main/java/org/wildfly/testing/junit/annotations/JBossHome.java → api/src/main/java/org/wildfly/testing/junit/annotation/JBossHome.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.wildfly.testing.junit.annotations;
+package org.wildfly.testing.junit.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

api/src/main/java/org/wildfly/testing/junit/annotations/RequiresModule.java → api/src/main/java/org/wildfly/testing/junit/annotation/RequiresModule.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.wildfly.testing.junit.annotations;
+package org.wildfly.testing.junit.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

api/src/main/java/org/wildfly/testing/junit/annotations/RequiresModules.java → api/src/main/java/org/wildfly/testing/junit/annotation/RequiresModules.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.wildfly.testing.junit.annotations;
+package org.wildfly.testing.junit.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

api/src/main/java/org/wildfly/testing/junit/condition/JBossHomeParameterResolver.java

@@ -13,7 +13,7 @@
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
-import org.wildfly.testing.junit.annotations.JBossHome;
+import org.wildfly.testing.junit.annotation.JBossHome;
 
 /**
  * Resolves the {@code jboss.home} system property or if not set the {@code JBOSS_HOME} environment variable. If neither

api/src/main/java/org/wildfly/testing/junit/condition/RequiresModuleExecutionCondition.java

@@ -28,8 +28,8 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.support.AnnotationSupport;
 import org.wildfly.plugin.tools.VersionComparator;
-import org.wildfly.testing.junit.annotations.AnyOf;
-import org.wildfly.testing.junit.annotations.RequiresModule;
+import org.wildfly.testing.junit.annotation.AnyOf;
+import org.wildfly.testing.junit.annotation.RequiresModule;
 import org.xml.sax.SAXException;
 
 /**

api/src/test/java/org/wildfly/testing/junit/JBossHomeParameterTestCase.java

@@ -11,7 +11,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
-import org.wildfly.testing.junit.annotations.JBossHome;
+import org.wildfly.testing.junit.annotation.JBossHome;
 
 /**
  *

api/src/test/java/org/wildfly/testing/junit/RequireArtifact.java

@@ -7,7 +7,7 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.wildfly.testing.junit.annotations.RequiresModule;
+import org.wildfly.testing.junit.annotation.RequiresModule;
 
 /**
  * @author <a href="mailto:jpekrins@ibm.com">James R. Perkins</a>

api/src/test/java/org/wildfly/testing/junit/RequireMultiModules.java

@@ -6,9 +6,9 @@
 package org.wildfly.testing.junit;
 
 import org.junit.jupiter.api.Test;
-import org.wildfly.testing.junit.annotations.AnyOf;
-import org.wildfly.testing.junit.annotations.RequiresModule;
-import org.wildfly.testing.junit.annotations.RequiresModules;
+import org.wildfly.testing.junit.annotation.AnyOf;
+import org.wildfly.testing.junit.annotation.RequiresModule;
+import org.wildfly.testing.junit.annotation.RequiresModules;
 
 /**
  * @author <a href="mailto:jpekrins@ibm.com">James R. Perkins</a>

api/src/test/java/org/wildfly/testing/junit/RequireResourceRoot.java

@@ -6,7 +6,7 @@
 package org.wildfly.testing.junit;
 
 import org.junit.jupiter.api.Test;
-import org.wildfly.testing.junit.annotations.RequiresModule;
+import org.wildfly.testing.junit.annotation.RequiresModule;
 
 /**
  * @author <a href="mailto:jpekrins@ibm.com">James R. Perkins</a>

api/src/test/java/org/wildfly/testing/junit/RequireSnapshot.java

@@ -6,7 +6,7 @@
 package org.wildfly.testing.junit;
 
 import org.junit.jupiter.api.Test;
-import org.wildfly.testing.junit.annotations.RequiresModule;
+import org.wildfly.testing.junit.annotation.RequiresModule;
 
 /**
  * @author <a href="mailto:jpekrins@ibm.com">James R. Perkins</a>

api/src/test/java/org/wildfly/testing/junit/RequiresModuleTestCase.java

@@ -18,10 +18,10 @@
 import org.junit.platform.engine.discovery.DiscoverySelectors;
 import org.junit.platform.testkit.engine.EngineTestKit;
 import org.junit.platform.testkit.engine.EventConditions;
-import org.wildfly.testing.junit.annotations.JBossHome;
+import org.wildfly.testing.junit.annotation.JBossHome;
 
 /**
- * Tests for the {@link org.wildfly.testing.junit.annotations.RequiresModule} annotation.
+ * Tests for the {@link org.wildfly.testing.junit.annotation.RequiresModule} annotation.
  *
  * @author <a href="mailto:jperkins@redhat.com">James R. Perkins</a>
  */

extension/src/main/java/org/wildfly/testing/junit/extension/ServerResourceExtension.java

@@ -20,7 +20,7 @@
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.platform.commons.support.AnnotationSupport;
-import org.wildfly.testing.junit.extension.annotations.ServerResource;
+import org.wildfly.testing.junit.extension.annotation.ServerResource;
 import org.wildfly.testing.junit.extension.api.ServerResourceProducer;
 
 /**

extension/src/main/java/org/wildfly/testing/junit/extension/TestSupport.java

@@ -19,9 +19,9 @@
 import org.junit.platform.commons.support.AnnotationSupport;
 import org.junit.platform.commons.support.HierarchyTraversalMode;
 import org.junit.platform.commons.util.AnnotationUtils;
-import org.wildfly.testing.junit.extension.annotations.DeploymentProducer;
-import org.wildfly.testing.junit.extension.annotations.GenerateDeployment;
-import org.wildfly.testing.junit.extension.annotations.ManualMode;
+import org.wildfly.testing.junit.extension.annotation.DeploymentProducer;
+import org.wildfly.testing.junit.extension.annotation.GenerateDeployment;
+import org.wildfly.testing.junit.extension.annotation.ManualMode;
 
 /**
  * Support class for the extension.

extension/src/main/java/org/wildfly/testing/junit/extension/UriProducer.java

@@ -20,8 +20,8 @@
 import org.kohsuke.MetaInfServices;
 import org.wildfly.plugin.tools.server.DomainManager;
 import org.wildfly.plugin.tools.server.ServerManager;
-import org.wildfly.testing.junit.extension.annotations.DomainServer;
-import org.wildfly.testing.junit.extension.annotations.RequestPath;
+import org.wildfly.testing.junit.extension.annotation.DomainServer;
+import org.wildfly.testing.junit.extension.annotation.RequestPath;
 import org.wildfly.testing.junit.extension.api.ServerConfiguration;
 import org.wildfly.testing.junit.extension.api.ServerResourceProducer;
 

extension/src/main/java/org/wildfly/testing/junit/extension/WildFlyExtension.java

@@ -24,8 +24,8 @@
 import org.wildfly.plugin.tools.server.Configuration;
 import org.wildfly.plugin.tools.server.ServerManager;
 import org.wildfly.plugin.tools.server.ServerManagerListener;
-import org.wildfly.testing.junit.extension.annotations.Domain;
-import org.wildfly.testing.junit.extension.annotations.ManualMode;
+import org.wildfly.testing.junit.extension.annotation.Domain;
+import org.wildfly.testing.junit.extension.annotation.ManualMode;
 import org.wildfly.testing.junit.extension.api.DomainConfigurationFactory;
 import org.wildfly.testing.junit.extension.api.ServerConfiguration;
 import org.wildfly.testing.junit.extension.api.StandaloneConfigurationFactory;

extension/src/main/java/org/wildfly/testing/junit/extension/annotations/DeploymentProducer.java → extension/src/main/java/org/wildfly/testing/junit/extension/annotation/DeploymentProducer.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.wildfly.testing.junit.extension.annotations;
+package org.wildfly.testing.junit.extension.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

extension/src/main/java/org/wildfly/testing/junit/extension/annotations/Domain.java → extension/src/main/java/org/wildfly/testing/junit/extension/annotation/Domain.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.wildfly.testing.junit.extension.annotations;
+package org.wildfly.testing.junit.extension.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

extension/src/main/java/org/wildfly/testing/junit/extension/annotations/DomainServer.java → extension/src/main/java/org/wildfly/testing/junit/extension/annotation/DomainServer.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.wildfly.testing.junit.extension.annotations;
+package org.wildfly.testing.junit.extension.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

extension/src/main/java/org/wildfly/testing/junit/extension/annotations/GenerateDeployment.java → extension/src/main/java/org/wildfly/testing/junit/extension/annotation/GenerateDeployment.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.wildfly.testing.junit.extension.annotations;
+package org.wildfly.testing.junit.extension.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

extension/src/main/java/org/wildfly/testing/junit/extension/annotations/ManualMode.java → extension/src/main/java/org/wildfly/testing/junit/extension/annotation/ManualMode.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.wildfly.testing.junit.extension.annotations;
+package org.wildfly.testing.junit.extension.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

extension/src/main/java/org/wildfly/testing/junit/extension/annotations/RequestPath.java → extension/src/main/java/org/wildfly/testing/junit/extension/annotation/RequestPath.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.wildfly.testing.junit.extension.annotations;
+package org.wildfly.testing.junit.extension.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

extension/src/main/java/org/wildfly/testing/junit/extension/annotations/ServerResource.java → extension/src/main/java/org/wildfly/testing/junit/extension/annotation/ServerResource.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.wildfly.testing.junit.extension.annotations;
+package org.wildfly.testing.junit.extension.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

extension/src/main/java/org/wildfly/testing/junit/extension/annotations/WildFlyTest.java → extension/src/main/java/org/wildfly/testing/junit/extension/annotation/WildFlyTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.wildfly.testing.junit.extension.annotations;
+package org.wildfly.testing.junit.extension.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

extension/src/main/java/org/wildfly/testing/junit/extension/api/ServerResourceProducer.java

@@ -12,7 +12,7 @@
 /**
  * An implementation of this interface is used to inject static fields, instance fields and parameters. For static
  * fields and instance fields, the field must be annotated with
- * {@link org.wildfly.testing.junit.extension.annotations.ServerResource}.
+ * {@link org.wildfly.testing.junit.extension.annotation.ServerResource}.
  *
  * @author <a href="mailto:jperkins@ibm.com">James R. Perkins</a>
  */

extension/src/test/java/org/wildfly/testing/extension/extension/deployment/AbstractEarDeploymentTest.java

@@ -13,8 +13,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.wildfly.plugin.tools.server.ServerManager;
-import org.wildfly.testing.junit.extension.annotations.ServerResource;
-import org.wildfly.testing.junit.extension.annotations.WildFlyTest;
+import org.wildfly.testing.junit.extension.annotation.ServerResource;
+import org.wildfly.testing.junit.extension.annotation.WildFlyTest;
 
 /**
  * Abstract base class for EAR deployment tests. Subclasses only need to provide the deployment method.

extension/src/test/java/org/wildfly/testing/extension/extension/deployment/AbstractJarDeploymentTest.java

@@ -8,8 +8,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.wildfly.plugin.tools.server.ServerManager;
-import org.wildfly.testing.junit.extension.annotations.ServerResource;
-import org.wildfly.testing.junit.extension.annotations.WildFlyTest;
+import org.wildfly.testing.junit.extension.annotation.ServerResource;
+import org.wildfly.testing.junit.extension.annotation.WildFlyTest;
 
 /**
  * Abstract base class for JAR deployment tests. Subclasses only need to provide the deployment method.

extension/src/test/java/org/wildfly/testing/extension/extension/deployment/AbstractRarDeploymentTest.java

@@ -8,8 +8,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.wildfly.plugin.tools.server.ServerManager;
-import org.wildfly.testing.junit.extension.annotations.ServerResource;
-import org.wildfly.testing.junit.extension.annotations.WildFlyTest;
+import org.wildfly.testing.junit.extension.annotation.ServerResource;
+import org.wildfly.testing.junit.extension.annotation.WildFlyTest;
 
 /**
  * Abstract base class for RAR deployment tests. Subclasses only need to provide the deployment method.

extension/src/test/java/org/wildfly/testing/extension/extension/deployment/AbstractWarDeploymentTest.java

@@ -12,9 +12,9 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.wildfly.testing.junit.extension.annotations.RequestPath;
-import org.wildfly.testing.junit.extension.annotations.ServerResource;
-import org.wildfly.testing.junit.extension.annotations.WildFlyTest;
+import org.wildfly.testing.junit.extension.annotation.RequestPath;
+import org.wildfly.testing.junit.extension.annotation.ServerResource;
+import org.wildfly.testing.junit.extension.annotation.WildFlyTest;
 
 /**
  * Abstract base class for WAR deployment tests. Subclasses only need to provide the deployment method.

extension/src/test/java/org/wildfly/testing/extension/extension/deployment/DomainDeploymentIT.java

@@ -14,12 +14,12 @@
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.wildfly.testing.junit.extension.annotations.DeploymentProducer;
-import org.wildfly.testing.junit.extension.annotations.Domain;
-import org.wildfly.testing.junit.extension.annotations.DomainServer;
-import org.wildfly.testing.junit.extension.annotations.RequestPath;
-import org.wildfly.testing.junit.extension.annotations.ServerResource;
-import org.wildfly.testing.junit.extension.annotations.WildFlyTest;
+import org.wildfly.testing.junit.extension.annotation.DeploymentProducer;
+import org.wildfly.testing.junit.extension.annotation.Domain;
+import org.wildfly.testing.junit.extension.annotation.DomainServer;
+import org.wildfly.testing.junit.extension.annotation.RequestPath;
+import org.wildfly.testing.junit.extension.annotation.ServerResource;
+import org.wildfly.testing.junit.extension.annotation.WildFlyTest;
 
 /**
  *

extension/src/test/java/org/wildfly/testing/extension/extension/deployment/ExplicitWarDeploymentIT.java

@@ -6,7 +6,7 @@
 package org.wildfly.testing.extension.extension.deployment;
 
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.wildfly.testing.junit.extension.annotations.GenerateDeployment;
+import org.wildfly.testing.junit.extension.annotation.GenerateDeployment;
 
 /**
  * Tests {@link GenerateDeployment} with explicit WAR type (not inferred).

extension/src/test/java/org/wildfly/testing/extension/extension/deployment/GenerateDeploymentWithTestInfoIT.java

@@ -9,7 +9,7 @@
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.TestInfo;
-import org.wildfly.testing.junit.extension.annotations.GenerateDeployment;
+import org.wildfly.testing.junit.extension.annotation.GenerateDeployment;
 
 /**
  * Tests {@link GenerateDeployment} with {@link TestInfo} parameter.

extension/src/test/java/org/wildfly/testing/extension/extension/deployment/GenerateDomainEarDeploymentIT.java

@@ -9,11 +9,11 @@
 
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.junit.jupiter.api.TestInfo;
-import org.wildfly.testing.junit.extension.annotations.Domain;
-import org.wildfly.testing.junit.extension.annotations.DomainServer;
-import org.wildfly.testing.junit.extension.annotations.GenerateDeployment;
-import org.wildfly.testing.junit.extension.annotations.RequestPath;
-import org.wildfly.testing.junit.extension.annotations.ServerResource;
+import org.wildfly.testing.junit.extension.annotation.Domain;
+import org.wildfly.testing.junit.extension.annotation.DomainServer;
+import org.wildfly.testing.junit.extension.annotation.GenerateDeployment;
+import org.wildfly.testing.junit.extension.annotation.RequestPath;
+import org.wildfly.testing.junit.extension.annotation.ServerResource;
 import org.wildfly.testing.tools.deployment.Deployments;
 
 /**

extension/src/test/java/org/wildfly/testing/extension/extension/deployment/GenerateJarDeploymentIT.java

@@ -7,7 +7,7 @@
 
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.wildfly.testing.junit.extension.annotations.GenerateDeployment;
+import org.wildfly.testing.junit.extension.annotation.GenerateDeployment;
 
 /**
  * Tests {@link GenerateDeployment} with explicit JAR type.

extension/src/test/java/org/wildfly/testing/extension/extension/deployment/GenerateRarDeploymentIT.java

@@ -7,7 +7,7 @@
 
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
-import org.wildfly.testing.junit.extension.annotations.GenerateDeployment;
+import org.wildfly.testing.junit.extension.annotation.GenerateDeployment;
 
 /**
  * Tests {@link GenerateDeployment} with explicit RAR type.

extension/src/test/java/org/wildfly/testing/extension/extension/deployment/GenerateStandaloneEarDeploymentIT.java

@@ -9,9 +9,9 @@
 
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.junit.jupiter.api.TestInfo;
-import org.wildfly.testing.junit.extension.annotations.GenerateDeployment;
-import org.wildfly.testing.junit.extension.annotations.RequestPath;
-import org.wildfly.testing.junit.extension.annotations.ServerResource;
+import org.wildfly.testing.junit.extension.annotation.GenerateDeployment;
+import org.wildfly.testing.junit.extension.annotation.RequestPath;
+import org.wildfly.testing.junit.extension.annotation.ServerResource;
 import org.wildfly.testing.tools.deployment.Deployments;
 
 /**