Skip to content

Commit 2a68c86

Browse files
jamezpjamezp
authored
Merge pull request #15 from jamezp/project-updates
Rename packages from plural to singular.
2 parents 3ccadbb + 01ef0ef commit 2a68c86

File tree

69 files changed

+136
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+136
-151
lines changed

‎api/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,6 @@
8585
</execution>
8686
</executions>
8787
</plugin>
88-
<!-- We need to bind a new execution of this to run after provisioning is done so the module.xml file
89-
required for testing is not deleted.
90-
-->
91-
<plugin>
92-
<artifactId>maven-resources-plugin</artifactId>
93-
<executions>
94-
<execution>
95-
<id>copy-module</id>
96-
<phase>pre-integration-test</phase>
97-
<goals>
98-
<goal>testResources</goal>
99-
</goals>
100-
</execution>
101-
</executions>
102-
</plugin>
10388
</plugins>
10489
</build>
10590
</project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package org.wildfly.testing.junit.annotations;
6+
package org.wildfly.testing.junit.annotation;
77

88
import java.lang.annotation.Documented;
99
import java.lang.annotation.ElementType;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package org.wildfly.testing.junit.annotations;
6+
package org.wildfly.testing.junit.annotation;
77

88
import java.lang.annotation.Documented;
99
import java.lang.annotation.ElementType;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package org.wildfly.testing.junit.annotations;
6+
package org.wildfly.testing.junit.annotation;
77

88
import java.lang.annotation.Documented;
99
import java.lang.annotation.ElementType;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package org.wildfly.testing.junit.annotations;
6+
package org.wildfly.testing.junit.annotation;
77

88
import java.lang.annotation.Documented;
99
import java.lang.annotation.ElementType;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.junit.jupiter.api.extension.ParameterContext;
1414
import org.junit.jupiter.api.extension.ParameterResolutionException;
1515
import org.junit.jupiter.api.extension.ParameterResolver;
16-
import org.wildfly.testing.junit.annotations.JBossHome;
16+
import org.wildfly.testing.junit.annotation.JBossHome;
1717

1818
/**
1919
* 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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import org.junit.jupiter.api.extension.ExtensionContext;
2929
import org.junit.platform.commons.support.AnnotationSupport;
3030
import org.wildfly.plugin.tools.VersionComparator;
31-
import org.wildfly.testing.junit.annotations.AnyOf;
32-
import org.wildfly.testing.junit.annotations.RequiresModule;
31+
import org.wildfly.testing.junit.annotation.AnyOf;
32+
import org.wildfly.testing.junit.annotation.RequiresModule;
3333
import org.xml.sax.SAXException;
3434

3535
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.junit.jupiter.api.Assertions;
1212
import org.junit.jupiter.api.Tag;
1313
import org.junit.jupiter.api.Test;
14-
import org.wildfly.testing.junit.annotations.JBossHome;
14+
import org.wildfly.testing.junit.annotation.JBossHome;
1515

1616
/**
1717
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import org.junit.jupiter.api.Assertions;
99
import org.junit.jupiter.api.Test;
10-
import org.wildfly.testing.junit.annotations.RequiresModule;
10+
import org.wildfly.testing.junit.annotation.RequiresModule;
1111

1212
/**
1313
* @author <a href="mailto:jpekrins@ibm.com">James R. Perkins</a>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
package org.wildfly.testing.junit;
77

88
import org.junit.jupiter.api.Test;
9-
import org.wildfly.testing.junit.annotations.AnyOf;
10-
import org.wildfly.testing.junit.annotations.RequiresModule;
11-
import org.wildfly.testing.junit.annotations.RequiresModules;
9+
import org.wildfly.testing.junit.annotation.AnyOf;
10+
import org.wildfly.testing.junit.annotation.RequiresModule;
11+
import org.wildfly.testing.junit.annotation.RequiresModules;
1212

1313
/**
1414
* @author <a href="mailto:jpekrins@ibm.com">James R. Perkins</a>

0 commit comments

Comments
 (0)