diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ae162c64..d1d5363c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,10 +4,23 @@ updates: directory: "/" schedule: interval: daily - open-pull-requests-limit: 15 + open-pull-requests-limit: 20 + target-branch: master +- package-ecosystem: github-actions + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 20 + target-branch: "5.0" +- package-ecosystem: maven + directory: "/" + schedule: + interval: monthly + open-pull-requests-limit: 20 target-branch: master - package-ecosystem: maven directory: "/" schedule: interval: monthly - open-pull-requests-limit: 10 + open-pull-requests-limit: 20 + target-branch: "5.0" diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml index ac8b070b..5fbbe5c6 100644 --- a/.github/workflows/ci-actions.yml +++ b/.github/workflows/ci-actions.yml @@ -6,7 +6,7 @@ on: jobs: build-weld-junit: - name: "Weld Testing build, JDK ${{matrix.java.name}}, JUnit ${{matrix.junit.name}}" + name: "Weld Testing build, JDK ${{matrix.java.name}}" runs-on: ubuntu-latest strategy: fail-fast: false @@ -20,14 +20,9 @@ jobs: name: "21", java-version: 21, } - junit: - { - name: "5.x", - profile: "junit5", - } - - { - name: "6.x", - profile: "junit6", + name: "25", + java-version: 25, } steps: - uses: actions/checkout@v6 @@ -50,7 +45,7 @@ jobs: # after the job is done. In this case we refresh the cache monthly (by changing key) to avoid unlimited growth. key: q2maven-master-${{ steps.get-date.outputs.date }} - name: Build with Maven - run: WELD_JUNIT_DEBUG=spotbugs mvn clean install -Dno-format -Dspotbugs.failOnError=true -D${{matrix.junit.profile}} + run: WELD_JUNIT_DEBUG=spotbugs mvn clean install -Dno-format -Dspotbugs.failOnError=true - name: Delete Local Artifacts From Cache shell: bash run: rm -r ~/.m2/repository/org/jboss/weld/weld-junit* diff --git a/README.md b/README.md index 82ec4a87..6de405cc 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Simulating field injection to start with, then interceptors and/or decorators - There are frameworks to make this easier such as [Mockito](http://site.mockito.org/); but use too many mocks and things get tangled real quick. So we came with JUnit/Spock extensions which allow you to use actual CDI container instead of complex simulations. There is no need to change the way you develop your CDI components if you have a real container to test it with. -Besides, it's easy to combine this approach with mocking frameworks (see for instance [Adding mock beans](junit5/README.md#adding-mock-beans)). +Besides, it's easy to combine this approach with mocking frameworks (see for instance [Adding mock beans](junit-jupiter/README.md#adding-mock-beans)). ## How To Use Each Extension @@ -34,7 +34,7 @@ Below is a list with links to detailed README of each extension: * JUnit 4 extension * [JUnit 4 extension using `@Rule` and `@ClassRule` mechanism](junit4/README.md) * JUnit 5 - * [JUnit 5 extension using the `@ExtendWith` mechanism](junit5/README.md) + * [JUnit 5 extension using the `@ExtendWith` mechanism](junit-jupiter/README.md) * JUnit-common * Houses the parts of code shared by both Junit extensions * Spock diff --git a/junit-common/pom.xml b/junit-common/pom.xml index 3f67c322..558ff7f3 100644 --- a/junit-common/pom.xml +++ b/junit-common/pom.xml @@ -7,7 +7,7 @@ org.jboss.weld weld-junit-parent - 5.0.4-SNAPSHOT + 6.0.0-SNAPSHOT weld-junit-common diff --git a/junit5/.gitignore b/junit-jupiter/.gitignore similarity index 100% rename from junit5/.gitignore rename to junit-jupiter/.gitignore diff --git a/junit5/README.md b/junit-jupiter/README.md similarity index 96% rename from junit5/README.md rename to junit-jupiter/README.md index 08afbc2d..bb2598fd 100644 --- a/junit5/README.md +++ b/junit-jupiter/README.md @@ -50,7 +50,7 @@ Requirements are JUnit 5 and Java 17. ```xml org.jboss.weld - weld-junit5 + weld-junit-jupiter ${version.weld-junit} ``` @@ -94,7 +94,7 @@ This default behaviour includes: * Shut down the container after test is done ```java -import org.jboss.weld.junit5.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -113,19 +113,19 @@ class BasicUsageTest { ### WeldInitiator -`org.jboss.weld.junit5.WeldInitiator` is an entry point you will want to define if you wish to customize how we bootstrap Weld. +`org.jboss.weld.junit.jupiter.WeldInitiator` is an entry point you will want to define if you wish to customize how we bootstrap Weld. The container is configured through a provided `org.jboss.weld.environment.se.Weld` instance. By default, the container is optimized for testing purposes, i.e. with automatic discovery and concurrent deployment disabled (see also `WeldInitiator.createWeld()`). However, it is possible to provide a customized `Weld` instance - see also `WeldInitiator.of(Weld)` and `WeldInitiator.from(Weld)` methods. `WeldInitiator` also implements `jakarta.enterprise.inject.Instance` and therefore might be used to perform programmatic lookup of bean instances. -`WeldInitiator` should be available in a field annotated with `@org.jboss.weld.junit5.WeldSetup`. +`WeldInitiator` should be available in a field annotated with `@org.jboss.weld.junit.jupiter.WeldSetup`. From there you can use static methods: ```java -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -513,8 +513,8 @@ By default, the extension will: Here is a simple example using the default plus one additional annotation (`@AddPackages`): ```java -import org.jboss.weld.junit5.auto.beans.Engine; -import org.jboss.weld.junit5.auto.beans.V8; +import org.jboss.weld.junit.jupiter.auto.beans.Engine; +import org.jboss.weld.junit.jupiter.auto.beans.V8; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -600,8 +600,8 @@ It will not exclude beans of the implied type that are defined by `@Produces` pr Also, the current implementation excludes beans based on type, disregarding any qualifiers that are specified. ```java -import org.jboss.weld.junit5.auto.ExcludeBean; -import org.jboss.weld.junit5.auto.WeldJunit5AutoExtension; +import org.jboss.weld.junit.jupiter.auto.ExcludeBean; +import org.jboss.weld.junit.jupiter.auto.WeldJunit5AutoExtension; import org.junit.jupiter.api.Test; import jakarta.enterprise.inject.Produces; @@ -652,8 +652,8 @@ This is mainly for usability, as it would be annoying to constantly type additio However, we are aware that this might cause trouble if more extensions are competing for parameter resolution. In such case, you can turn on explicit parameter resolution and Weld will only resolve parameters which have at least one `jakarta.inject.Qualifier` annotation on them. There are two ways to enable it: -* First option is enabling this globally through a system property - `org.jboss.weld.junit5.explicitParamInjection=true` -This property is also available as a constant in our extension class; you can therefore refer to it via `org.jboss.weld.junit5.WeldJunit5Extension.GLOBAL_EXPLICIT_PARAM_INJECTION`. +* First option is enabling this globally through a system property - `org.jboss.weld.junit.jupiter.explicitParamInjection=true` +This property is also available as a constant in our extension class; you can therefore refer to it via `org.jboss.weld.junit.jupiter.WeldJunit5Extension.GLOBAL_EXPLICIT_PARAM_INJECTION`. * The other approach is to use `@ExplicitParamInjection(boolean)` on either test method, or test class. In case of test class this annotation will enforce the presence on qualifiers on all methods. diff --git a/junit5/pom.xml b/junit-jupiter/pom.xml similarity index 93% rename from junit5/pom.xml rename to junit-jupiter/pom.xml index 5262ca4c..adcf391b 100644 --- a/junit5/pom.xml +++ b/junit-jupiter/pom.xml @@ -2,15 +2,15 @@ 4.0.0 - Weld JUnit 5 Extensions + Weld JUnit Jupiter Extensions org.jboss.weld weld-junit-parent - 5.0.4-SNAPSHOT + 6.0.0-SNAPSHOT - weld-junit5 + weld-junit-jupiter diff --git a/junit5/src/main/java/org/jboss/weld/junit5/EnableWeld.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/EnableWeld.java similarity index 97% rename from junit5/src/main/java/org/jboss/weld/junit5/EnableWeld.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/EnableWeld.java index 03889e85..4d930e71 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/EnableWeld.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/EnableWeld.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5; +package org.jboss.weld.junit.jupiter; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/ExplicitParamInjection.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/ExplicitParamInjection.java similarity index 98% rename from junit5/src/main/java/org/jboss/weld/junit5/ExplicitParamInjection.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/ExplicitParamInjection.java index 8748b2c7..97578cf6 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/ExplicitParamInjection.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/ExplicitParamInjection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5; +package org.jboss.weld.junit.jupiter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/ExtensionContextUtils.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/ExtensionContextUtils.java similarity index 99% rename from junit5/src/main/java/org/jboss/weld/junit5/ExtensionContextUtils.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/ExtensionContextUtils.java index 124049ce..5250926a 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/ExtensionContextUtils.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/ExtensionContextUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5; +package org.jboss.weld.junit.jupiter; import java.util.List; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/WeldInitiator.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldInitiator.java similarity index 99% rename from junit5/src/main/java/org/jboss/weld/junit5/WeldInitiator.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldInitiator.java index 41447b05..d64d6c15 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/WeldInitiator.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldInitiator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5; +package org.jboss.weld.junit.jupiter; import java.lang.annotation.Annotation; import java.util.List; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/WeldJunit5Extension.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldJunit5Extension.java similarity index 95% rename from junit5/src/main/java/org/jboss/weld/junit5/WeldJunit5Extension.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldJunit5Extension.java index 3cfb829b..444f50c1 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/WeldJunit5Extension.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldJunit5Extension.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5; - -import static org.jboss.weld.junit5.ExtensionContextUtils.getContainerFromStore; -import static org.jboss.weld.junit5.ExtensionContextUtils.getEnrichersFromStore; -import static org.jboss.weld.junit5.ExtensionContextUtils.getExplicitInjectionInfoFromStore; -import static org.jboss.weld.junit5.ExtensionContextUtils.getInitiatorFromStore; -import static org.jboss.weld.junit5.ExtensionContextUtils.removeContainerFromStore; -import static org.jboss.weld.junit5.ExtensionContextUtils.setContainerToStore; -import static org.jboss.weld.junit5.ExtensionContextUtils.setEnrichersToStore; -import static org.jboss.weld.junit5.ExtensionContextUtils.setExplicitInjectionInfoToStore; -import static org.jboss.weld.junit5.ExtensionContextUtils.setInitiatorToStore; +package org.jboss.weld.junit.jupiter; + +import static org.jboss.weld.junit.jupiter.ExtensionContextUtils.getContainerFromStore; +import static org.jboss.weld.junit.jupiter.ExtensionContextUtils.getEnrichersFromStore; +import static org.jboss.weld.junit.jupiter.ExtensionContextUtils.getExplicitInjectionInfoFromStore; +import static org.jboss.weld.junit.jupiter.ExtensionContextUtils.getInitiatorFromStore; +import static org.jboss.weld.junit.jupiter.ExtensionContextUtils.removeContainerFromStore; +import static org.jboss.weld.junit.jupiter.ExtensionContextUtils.setContainerToStore; +import static org.jboss.weld.junit.jupiter.ExtensionContextUtils.setEnrichersToStore; +import static org.jboss.weld.junit.jupiter.ExtensionContextUtils.setExplicitInjectionInfoToStore; +import static org.jboss.weld.junit.jupiter.ExtensionContextUtils.setInitiatorToStore; import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS; import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD; @@ -96,7 +96,7 @@ public class WeldJunit5Extension implements AfterAllCallback, BeforeAllCallback, BeforeEachCallback, AfterEachCallback, ParameterResolver { // global system property - public static final String GLOBAL_EXPLICIT_PARAM_INJECTION = "org.jboss.weld.junit5.explicitParamInjection"; + public static final String GLOBAL_EXPLICIT_PARAM_INJECTION = "org.jboss.weld.junit.jupiter.explicitParamInjection"; private static void storeExplicitParamResolutionInformation(ExtensionContext ec) { // check system property which may have set the global explicit param injection diff --git a/junit5/src/main/java/org/jboss/weld/junit5/WeldJunitEnricher.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldJunitEnricher.java similarity index 95% rename from junit5/src/main/java/org/jboss/weld/junit5/WeldJunitEnricher.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldJunitEnricher.java index c4e69c13..a202ffdf 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/WeldJunitEnricher.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldJunitEnricher.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5; +package org.jboss.weld.junit.jupiter; import org.jboss.weld.environment.se.Weld; -import org.jboss.weld.junit5.WeldInitiator.Builder; +import org.jboss.weld.junit.jupiter.WeldInitiator.Builder; import org.junit.jupiter.api.extension.ExtensionContext; /** diff --git a/junit5/src/main/java/org/jboss/weld/junit5/WeldSetup.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldSetup.java similarity index 96% rename from junit5/src/main/java/org/jboss/weld/junit5/WeldSetup.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldSetup.java index 3ee7a597..b612a435 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/WeldSetup.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/WeldSetup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5; +package org.jboss.weld.junit.jupiter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/ActivateScopes.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/ActivateScopes.java similarity index 97% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/ActivateScopes.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/ActivateScopes.java index f55abcbb..4b8c431f 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/ActivateScopes.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/ActivateScopes.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/AddBeanClasses.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/AddBeanClasses.java similarity index 97% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/AddBeanClasses.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/AddBeanClasses.java index d2f7f59f..2aaac0f2 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/AddBeanClasses.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/AddBeanClasses.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/AddEnabledDecorators.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/AddEnabledDecorators.java similarity index 97% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/AddEnabledDecorators.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/AddEnabledDecorators.java index 6e82b769..157dfa57 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/AddEnabledDecorators.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/AddEnabledDecorators.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/AddEnabledInterceptors.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/AddEnabledInterceptors.java similarity index 97% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/AddEnabledInterceptors.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/AddEnabledInterceptors.java index 76be3e9c..d9fd8980 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/AddEnabledInterceptors.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/AddEnabledInterceptors.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/AddExtensions.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/AddExtensions.java similarity index 97% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/AddExtensions.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/AddExtensions.java index 1667a20e..ed2e3819 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/AddExtensions.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/AddExtensions.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/AddPackages.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/AddPackages.java similarity index 97% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/AddPackages.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/AddPackages.java index db788244..58633e36 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/AddPackages.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/AddPackages.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/ClassScanning.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/ClassScanning.java similarity index 99% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/ClassScanning.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/ClassScanning.java index eabf1820..477806dd 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/ClassScanning.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/ClassScanning.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static java.util.Arrays.asList; import static java.util.Arrays.stream; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/EnableAlternativeStereotypes.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/EnableAlternativeStereotypes.java similarity index 97% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/EnableAlternativeStereotypes.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/EnableAlternativeStereotypes.java index 75175d1b..b5db0e4b 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/EnableAlternativeStereotypes.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/EnableAlternativeStereotypes.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/EnableAlternatives.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/EnableAlternatives.java similarity index 97% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/EnableAlternatives.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/EnableAlternatives.java index bb374c64..6fdefd1c 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/EnableAlternatives.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/EnableAlternatives.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/EnableAutoWeld.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/EnableAutoWeld.java similarity index 97% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/EnableAutoWeld.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/EnableAutoWeld.java index a3571343..3895d658 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/EnableAutoWeld.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/EnableAutoWeld.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/ExcludeBean.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/ExcludeBean.java similarity index 97% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/ExcludeBean.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/ExcludeBean.java index 2030204f..4f033845 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/ExcludeBean.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/ExcludeBean.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/ExcludeBeanClasses.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanClasses.java similarity index 97% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/ExcludeBeanClasses.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanClasses.java index b9f69acf..4dd4a135 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/ExcludeBeanClasses.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanClasses.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/ExcludedBeansExtension.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/ExcludedBeansExtension.java similarity index 97% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/ExcludedBeansExtension.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/ExcludedBeansExtension.java index f424c584..d73fac2c 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/ExcludedBeansExtension.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/ExcludedBeansExtension.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import java.lang.reflect.Type; import java.util.Set; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/SetBeanDiscoveryMode.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/SetBeanDiscoveryMode.java similarity index 95% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/SetBeanDiscoveryMode.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/SetBeanDiscoveryMode.java index 99e94aff..6ba319fd 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/SetBeanDiscoveryMode.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/SetBeanDiscoveryMode.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/TestInstanceInjectionExtension.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/TestInstanceInjectionExtension.java similarity index 95% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/TestInstanceInjectionExtension.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/TestInstanceInjectionExtension.java index a8bad21f..355c0c65 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/TestInstanceInjectionExtension.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/TestInstanceInjectionExtension.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.event.Observes; @@ -30,7 +30,7 @@ /** * Extension that makes a test instance appear like a regular bean even though instantiated by JUnit. * Injection into all test instances, also {@link org.junit.jupiter.api.Nested @Nested} ones, is handled in - * {@link org.jboss.weld.junit5.WeldInitiator#addObjectsToInjectInto} and related. + * {@link org.jboss.weld.junit.jupiter.WeldInitiator#addObjectsToInjectInto} and related. * Proper handling of all other CDI annotations such as {@link jakarta.enterprise.inject.Produces @Produces} is supported * only on top level test classes. */ diff --git a/junit5/src/main/java/org/jboss/weld/junit5/auto/WeldJunit5AutoExtension.java b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/WeldJunit5AutoExtension.java similarity index 92% rename from junit5/src/main/java/org/jboss/weld/junit5/auto/WeldJunit5AutoExtension.java rename to junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/WeldJunit5AutoExtension.java index 0ff109ef..2c3065a3 100644 --- a/junit5/src/main/java/org/jboss/weld/junit5/auto/WeldJunit5AutoExtension.java +++ b/junit-jupiter/src/main/java/org/jboss/weld/junit/jupiter/auto/WeldJunit5AutoExtension.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static java.lang.String.format; import static java.util.stream.Collectors.joining; -import static org.jboss.weld.junit5.ExtensionContextUtils.getExplicitInjectionInfoFromStore; +import static org.jboss.weld.junit.jupiter.ExtensionContextUtils.getExplicitInjectionInfoFromStore; import java.lang.reflect.Field; import java.util.List; import java.util.stream.Collectors; import org.jboss.weld.environment.se.Weld; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldJunitEnricher; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldJunitEnricher; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.platform.commons.support.AnnotationSupport; diff --git a/junit-jupiter/src/main/resources/META-INF/rewrite/weld-junit-jupiter-migration.yml b/junit-jupiter/src/main/resources/META-INF/rewrite/weld-junit-jupiter-migration.yml new file mode 100644 index 00000000..93e69f6e --- /dev/null +++ b/junit-jupiter/src/main/resources/META-INF/rewrite/weld-junit-jupiter-migration.yml @@ -0,0 +1,24 @@ +# +# Copyright The Weld Authors +# SPDX-License-Identifier: Apache-2.0 +# + +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.weld.junit.MigrateToWeldJunitJupiter +displayName: Migrate from weld-junit5 to weld-junit-jupiter +description: >- + Migrates usages of `weld-junit5` to `weld-junit-jupiter`. + This includes changing the Maven artifact ID and renaming the + `org.jboss.weld.junit5` package to `org.jboss.weld.junit.jupiter`. +recipeList: + - org.openrewrite.java.dependencies.ChangeDependency: + oldGroupId: org.jboss.weld + oldArtifactId: weld-junit5 + newGroupId: org.jboss.weld + newArtifactId: weld-junit-jupiter + newVersion: 6.0.0.Final + - org.openrewrite.java.ChangePackage: + oldPackageName: org.jboss.weld.junit5 + newPackageName: org.jboss.weld.junit.jupiter + recursive: true diff --git a/junit5/src/test/java/org/jboss/weld/junit5/alternative/AlternativeAsSoleBeanInSyntheticArchiveTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/alternative/AlternativeAsSoleBeanInSyntheticArchiveTest.java similarity index 83% rename from junit5/src/test/java/org/jboss/weld/junit5/alternative/AlternativeAsSoleBeanInSyntheticArchiveTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/alternative/AlternativeAsSoleBeanInSyntheticArchiveTest.java index 48f473b5..9a1b2038 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/alternative/AlternativeAsSoleBeanInSyntheticArchiveTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/alternative/AlternativeAsSoleBeanInSyntheticArchiveTest.java @@ -1,13 +1,13 @@ -package org.jboss.weld.junit5.alternative; +package org.jboss.weld.junit.jupiter.alternative; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.spi.Bean; import jakarta.inject.Inject; import org.jboss.weld.junit.MockBean; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/alternative/Fish.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/alternative/Fish.java similarity index 78% rename from junit5/src/test/java/org/jboss/weld/junit5/alternative/Fish.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/alternative/Fish.java index 6d06cc59..683fd3b8 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/alternative/Fish.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/alternative/Fish.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.alternative; +package org.jboss.weld.junit.jupiter.alternative; public class Fish { diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/ActivateScopesInheritanceTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ActivateScopesInheritanceTest.java similarity index 90% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/ActivateScopesInheritanceTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ActivateScopesInheritanceTest.java index 0cc0e5c6..6b02ad47 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/ActivateScopesInheritanceTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ActivateScopesInheritanceTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -12,9 +12,9 @@ import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Named; -import org.jboss.weld.junit5.auto.beans.Engine; -import org.jboss.weld.junit5.auto.beans.V6; -import org.jboss.weld.junit5.auto.beans.V8; +import org.jboss.weld.junit.jupiter.auto.beans.Engine; +import org.jboss.weld.junit.jupiter.auto.beans.V6; +import org.jboss.weld.junit.jupiter.auto.beans.V8; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/ActivateScopesTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ActivateScopesTest.java similarity index 89% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/ActivateScopesTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ActivateScopesTest.java index f45ec312..933e54cc 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/ActivateScopesTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ActivateScopesTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -12,9 +12,9 @@ import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Named; -import org.jboss.weld.junit5.auto.beans.Engine; -import org.jboss.weld.junit5.auto.beans.V6; -import org.jboss.weld.junit5.auto.beans.V8; +import org.jboss.weld.junit.jupiter.auto.beans.Engine; +import org.jboss.weld.junit.jupiter.auto.beans.V6; +import org.jboss.weld.junit.jupiter.auto.beans.V8; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/AddBeanClassesTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AddBeanClassesTest.java similarity index 75% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/AddBeanClassesTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AddBeanClassesTest.java index 78913e70..93de44e6 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/AddBeanClassesTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AddBeanClassesTest.java @@ -1,11 +1,11 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertNotNull; import jakarta.inject.Inject; -import org.jboss.weld.junit5.auto.beans.Engine; -import org.jboss.weld.junit5.auto.beans.V8; +import org.jboss.weld.junit.jupiter.auto.beans.Engine; +import org.jboss.weld.junit.jupiter.auto.beans.V8; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/AddDecoratorTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AddDecoratorTest.java similarity index 87% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/AddDecoratorTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AddDecoratorTest.java index 61acb1f6..2c3f2a75 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/AddDecoratorTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AddDecoratorTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import jakarta.inject.Inject; -import org.jboss.weld.junit5.auto.interceptorAndDecorator.DecoratedBean; -import org.jboss.weld.junit5.auto.interceptorAndDecorator.TestDecorator; +import org.jboss.weld.junit.jupiter.auto.interceptorAndDecorator.DecoratedBean; +import org.jboss.weld.junit.jupiter.auto.interceptorAndDecorator.TestDecorator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/AddExtensionsTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AddExtensionsTest.java similarity index 77% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/AddExtensionsTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AddExtensionsTest.java index 132ac094..a2bd7415 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/AddExtensionsTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AddExtensionsTest.java @@ -1,8 +1,8 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.jboss.weld.junit5.auto.extension.AddedExtension; +import org.jboss.weld.junit.jupiter.auto.extension.AddedExtension; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/AddInterceptorTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AddInterceptorTest.java similarity index 87% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/AddInterceptorTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AddInterceptorTest.java index 7748dd83..56bf6998 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/AddInterceptorTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AddInterceptorTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import jakarta.inject.Inject; -import org.jboss.weld.junit5.auto.interceptorAndDecorator.InterceptedBean; -import org.jboss.weld.junit5.auto.interceptorAndDecorator.TestInterceptor; +import org.jboss.weld.junit.jupiter.auto.interceptorAndDecorator.InterceptedBean; +import org.jboss.weld.junit.jupiter.auto.interceptorAndDecorator.TestInterceptor; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/AddPackagesTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AddPackagesTest.java similarity index 76% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/AddPackagesTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AddPackagesTest.java index ac59e3dc..425ce7cc 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/AddPackagesTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AddPackagesTest.java @@ -1,11 +1,11 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertNotNull; import jakarta.inject.Inject; -import org.jboss.weld.junit5.auto.beans.Engine; -import org.jboss.weld.junit5.auto.beans.V8; +import org.jboss.weld.junit.jupiter.auto.beans.Engine; +import org.jboss.weld.junit.jupiter.auto.beans.V8; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/AnnotationsInheritanceTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AnnotationsInheritanceTest.java similarity index 82% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/AnnotationsInheritanceTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AnnotationsInheritanceTest.java index 7fe66937..2aab836c 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/AnnotationsInheritanceTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AnnotationsInheritanceTest.java @@ -1,17 +1,17 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import jakarta.inject.Inject; -import org.jboss.weld.junit5.auto.beans.Engine; -import org.jboss.weld.junit5.auto.beans.V8; -import org.jboss.weld.junit5.auto.extension.AddedExtension; -import org.jboss.weld.junit5.auto.interceptorAndDecorator.DecoratedBean; -import org.jboss.weld.junit5.auto.interceptorAndDecorator.InterceptedBean; -import org.jboss.weld.junit5.auto.interceptorAndDecorator.TestDecorator; -import org.jboss.weld.junit5.auto.interceptorAndDecorator.TestInterceptor; +import org.jboss.weld.junit.jupiter.auto.beans.Engine; +import org.jboss.weld.junit.jupiter.auto.beans.V8; +import org.jboss.weld.junit.jupiter.auto.extension.AddedExtension; +import org.jboss.weld.junit.jupiter.auto.interceptorAndDecorator.DecoratedBean; +import org.jboss.weld.junit.jupiter.auto.interceptorAndDecorator.InterceptedBean; +import org.jboss.weld.junit.jupiter.auto.interceptorAndDecorator.TestDecorator; +import org.jboss.weld.junit.jupiter.auto.interceptorAndDecorator.TestInterceptor; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/AutoConfigWithWeldSetupTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AutoConfigWithWeldSetupTest.java similarity index 90% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/AutoConfigWithWeldSetupTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AutoConfigWithWeldSetupTest.java index e2df7dee..14b08ab5 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/AutoConfigWithWeldSetupTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/AutoConfigWithWeldSetupTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -7,8 +7,8 @@ import java.lang.reflect.Field; import java.util.Optional; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.AfterEachCallback; @@ -55,7 +55,7 @@ public void afterEach(ExtensionContext context) throws NoSuchFieldException, Ill Throwable throwable = executionException.get(); assertInstanceOf(IllegalStateException.class, throwable); assertEquals("When using automagic mode, no @WeldSetup annotated field should be present! Fields found:\n" - + "Field 'weld' with type class org.jboss.weld.junit5.WeldInitiator which is in class org.jboss.weld.junit5.auto.AutoConfigWithWeldSetupTest", + + "Field 'weld' with type class org.jboss.weld.junit.jupiter.WeldInitiator which is in class org.jboss.weld.junit.jupiter.auto.AutoConfigWithWeldSetupTest", throwable.getMessage()); } } diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/BasicAutoConfigTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/BasicAutoConfigTest.java similarity index 80% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/BasicAutoConfigTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/BasicAutoConfigTest.java index 68307dbd..3dc700d9 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/BasicAutoConfigTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/BasicAutoConfigTest.java @@ -1,12 +1,12 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import jakarta.inject.Inject; -import org.jboss.weld.junit5.basic.Foo; -import org.jboss.weld.junit5.explicitInjection.Bar; +import org.jboss.weld.junit.jupiter.basic.Foo; +import org.jboss.weld.junit.jupiter.explicitInjection.Bar; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanClassesDepsTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanClassesDepsTest.java similarity index 82% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanClassesDepsTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanClassesDepsTest.java index 22adcb87..2d6e77ef 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanClassesDepsTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanClassesDepsTest.java @@ -1,11 +1,11 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertNotNull; import jakarta.enterprise.inject.Produces; -import org.jboss.weld.junit5.basic.unsatisfied.FooDeps; -import org.jboss.weld.junit5.basic.unsatisfied.SomeFooDeps; +import org.jboss.weld.junit.jupiter.basic.unsatisfied.FooDeps; +import org.jboss.weld.junit.jupiter.basic.unsatisfied.SomeFooDeps; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanClassesTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanClassesTest.java similarity index 81% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanClassesTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanClassesTest.java index b1094561..97ddb5c5 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanClassesTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanClassesTest.java @@ -1,12 +1,12 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import jakarta.enterprise.inject.Produces; -import org.jboss.weld.junit5.basic.Foo; -import org.jboss.weld.junit5.basic.SomeFoo; +import org.jboss.weld.junit.jupiter.basic.Foo; +import org.jboss.weld.junit.jupiter.basic.SomeFoo; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanDepsTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanDepsTest.java similarity index 81% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanDepsTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanDepsTest.java index fa17af05..931cdc44 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanDepsTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanDepsTest.java @@ -1,11 +1,11 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertNotNull; import jakarta.enterprise.inject.Produces; -import org.jboss.weld.junit5.basic.unsatisfied.FooDeps; -import org.jboss.weld.junit5.basic.unsatisfied.SomeFooDeps; +import org.jboss.weld.junit.jupiter.basic.unsatisfied.FooDeps; +import org.jboss.weld.junit.jupiter.basic.unsatisfied.SomeFooDeps; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanHierarchyTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanHierarchyTest.java similarity index 76% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanHierarchyTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanHierarchyTest.java index bffd4c7c..9e7ff9e4 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanHierarchyTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanHierarchyTest.java @@ -1,13 +1,13 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import jakarta.enterprise.inject.Produces; -import org.jboss.weld.junit5.basic.Foo; -import org.jboss.weld.junit5.basic.IFoo; -import org.jboss.weld.junit5.basic.SomeIFoo; +import org.jboss.weld.junit.jupiter.basic.Foo; +import org.jboss.weld.junit.jupiter.basic.IFoo; +import org.jboss.weld.junit.jupiter.basic.SomeIFoo; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanMetaAnnotationTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanMetaAnnotationTest.java similarity index 90% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanMetaAnnotationTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanMetaAnnotationTest.java index 1e6f40bc..b238a61f 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanMetaAnnotationTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanMetaAnnotationTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -10,8 +10,8 @@ import jakarta.enterprise.inject.Produces; -import org.jboss.weld.junit5.basic.Foo; -import org.jboss.weld.junit5.basic.SomeFoo; +import org.jboss.weld.junit.jupiter.basic.Foo; +import org.jboss.weld.junit.jupiter.basic.SomeFoo; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanTest.java similarity index 80% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanTest.java index 4f5f1b07..4c0a5e03 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/ExcludeBeanTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExcludeBeanTest.java @@ -1,12 +1,12 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import jakarta.enterprise.inject.Produces; -import org.jboss.weld.junit5.basic.Foo; -import org.jboss.weld.junit5.basic.SomeFoo; +import org.jboss.weld.junit.jupiter.basic.Foo; +import org.jboss.weld.junit.jupiter.basic.SomeFoo; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/ExplicitParametersAutoConfigTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExplicitParametersAutoConfigTest.java similarity index 73% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/ExplicitParametersAutoConfigTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExplicitParametersAutoConfigTest.java index d736b47f..ee4596e4 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/ExplicitParametersAutoConfigTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ExplicitParametersAutoConfigTest.java @@ -1,14 +1,14 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import jakarta.enterprise.inject.Default; -import org.jboss.weld.junit5.ExplicitParamInjection; -import org.jboss.weld.junit5.basic.Foo; -import org.jboss.weld.junit5.explicitInjection.Bar; -import org.jboss.weld.junit5.explicitInjection.CustomExtension; +import org.jboss.weld.junit.jupiter.ExplicitParamInjection; +import org.jboss.weld.junit.jupiter.basic.Foo; +import org.jboss.weld.junit.jupiter.explicitInjection.Bar; +import org.jboss.weld.junit.jupiter.explicitInjection.CustomExtension; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/InheritedInjectedTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InheritedInjectedTest.java similarity index 96% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/InheritedInjectedTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InheritedInjectedTest.java index 0f3a0860..e680f7ee 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/InheritedInjectedTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InheritedInjectedTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/InheritedProducerFieldTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InheritedProducerFieldTest.java similarity index 96% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/InheritedProducerFieldTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InheritedProducerFieldTest.java index 6c73028e..8c719b73 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/InheritedProducerFieldTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InheritedProducerFieldTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/InheritedProducerMethodTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InheritedProducerMethodTest.java similarity index 96% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/InheritedProducerMethodTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InheritedProducerMethodTest.java index 7c1da6dc..73c65b6b 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/InheritedProducerMethodTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InheritedProducerMethodTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/InjectInstanceTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InjectInstanceTest.java similarity index 91% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/InjectInstanceTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InjectInstanceTest.java index 199f346c..bab81440 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/InjectInstanceTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InjectInstanceTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/InjectMethodParamTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InjectMethodParamTest.java similarity index 91% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/InjectMethodParamTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InjectMethodParamTest.java index 9f98b388..b2ad0619 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/InjectMethodParamTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InjectMethodParamTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/InjectParameterizedInstanceTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InjectParameterizedInstanceTest.java similarity index 91% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/InjectParameterizedInstanceTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InjectParameterizedInstanceTest.java index c1174701..e53a8907 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/InjectParameterizedInstanceTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InjectParameterizedInstanceTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/InjectParameterizedTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InjectParameterizedTest.java similarity index 89% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/InjectParameterizedTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InjectParameterizedTest.java index a87e6333..1fc7c5e3 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/InjectParameterizedTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/InjectParameterizedTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/ParametersAutoConfigTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ParametersAutoConfigTest.java similarity index 79% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/ParametersAutoConfigTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ParametersAutoConfigTest.java index 316868ac..b5977a88 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/ParametersAutoConfigTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ParametersAutoConfigTest.java @@ -1,10 +1,10 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.jboss.weld.junit5.basic.Foo; -import org.jboss.weld.junit5.explicitInjection.Bar; +import org.jboss.weld.junit.jupiter.basic.Foo; +import org.jboss.weld.junit.jupiter.explicitInjection.Bar; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/ProducerMethodParametersScanningTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ProducerMethodParametersScanningTest.java similarity index 83% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/ProducerMethodParametersScanningTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ProducerMethodParametersScanningTest.java index 3e319f10..37ef3fa9 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/ProducerMethodParametersScanningTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ProducerMethodParametersScanningTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,8 +6,8 @@ import jakarta.enterprise.inject.Produces; import jakarta.inject.Named; -import org.jboss.weld.junit5.auto.beans.Engine; -import org.jboss.weld.junit5.auto.beans.V6; +import org.jboss.weld.junit.jupiter.auto.beans.Engine; +import org.jboss.weld.junit.jupiter.auto.beans.V6; import org.junit.jupiter.api.Test; @EnableAutoWeld diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/ProducesBeforeTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ProducesBeforeTest.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/ProducesBeforeTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ProducesBeforeTest.java index 65cb5582..32de9a8c 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/ProducesBeforeTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ProducesBeforeTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/ScannedClassesAreNotForcedBeansTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ScannedClassesAreNotForcedBeansTest.java similarity index 85% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/ScannedClassesAreNotForcedBeansTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ScannedClassesAreNotForcedBeansTest.java index cf9c4385..2891d0fa 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/ScannedClassesAreNotForcedBeansTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ScannedClassesAreNotForcedBeansTest.java @@ -1,11 +1,11 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertNotNull; import jakarta.enterprise.inject.Produces; -import org.jboss.weld.junit5.auto.beans.unsatisfied.InjectedV8NoAnnotation; -import org.jboss.weld.junit5.auto.beans.unsatisfied.V8NoAnnotation; +import org.jboss.weld.junit.jupiter.auto.beans.unsatisfied.InjectedV8NoAnnotation; +import org.jboss.weld.junit.jupiter.auto.beans.unsatisfied.V8NoAnnotation; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/ScannedParameterClassesAreNotForcedBeansTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ScannedParameterClassesAreNotForcedBeansTest.java similarity index 85% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/ScannedParameterClassesAreNotForcedBeansTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ScannedParameterClassesAreNotForcedBeansTest.java index 114f803a..a498a26a 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/ScannedParameterClassesAreNotForcedBeansTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/ScannedParameterClassesAreNotForcedBeansTest.java @@ -1,11 +1,11 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertNotNull; import jakarta.enterprise.inject.Produces; -import org.jboss.weld.junit5.auto.beans.unsatisfied.ConstructedV8NoAnnotation; -import org.jboss.weld.junit5.auto.beans.unsatisfied.V8NoAnnotation; +import org.jboss.weld.junit.jupiter.auto.beans.unsatisfied.ConstructedV8NoAnnotation; +import org.jboss.weld.junit.jupiter.auto.beans.unsatisfied.V8NoAnnotation; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/SetDiscoveryModeAllTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/SetDiscoveryModeAllTest.java similarity index 82% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/SetDiscoveryModeAllTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/SetDiscoveryModeAllTest.java index cd0e9306..1cd5884a 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/SetDiscoveryModeAllTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/SetDiscoveryModeAllTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto; +package org.jboss.weld.junit.jupiter.auto; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -7,8 +7,8 @@ import jakarta.inject.Inject; import org.jboss.weld.bootstrap.spi.BeanDiscoveryMode; -import org.jboss.weld.junit5.auto.discovery.WithBeanDefiningAnnotation; -import org.jboss.weld.junit5.auto.discovery.WithoutBeanDefiningAnnotation; +import org.jboss.weld.junit.jupiter.auto.discovery.WithBeanDefiningAnnotation; +import org.jboss.weld.junit.jupiter.auto.discovery.WithoutBeanDefiningAnnotation; import org.junit.jupiter.api.Test; @EnableAutoWeld diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternativeStereotype/EnableAlternativeStereotypeInheritanceTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternativeStereotype/EnableAlternativeStereotypeInheritanceTest.java similarity index 85% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/alternativeStereotype/EnableAlternativeStereotypeInheritanceTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternativeStereotype/EnableAlternativeStereotypeInheritanceTest.java index b5f7d278..f8668c7b 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternativeStereotype/EnableAlternativeStereotypeInheritanceTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternativeStereotype/EnableAlternativeStereotypeInheritanceTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.alternativeStereotype; +package org.jboss.weld.junit.jupiter.auto.alternativeStereotype; import jakarta.inject.Inject; -import org.jboss.weld.junit5.auto.AddBeanClasses; -import org.jboss.weld.junit5.auto.EnableAlternativeStereotypes; -import org.jboss.weld.junit5.auto.EnableAutoWeld; +import org.jboss.weld.junit.jupiter.auto.AddBeanClasses; +import org.jboss.weld.junit.jupiter.auto.EnableAlternativeStereotypes; +import org.jboss.weld.junit.jupiter.auto.EnableAutoWeld; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternativeStereotype/EnableAlternativeStereotypeTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternativeStereotype/EnableAlternativeStereotypeTest.java similarity index 84% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/alternativeStereotype/EnableAlternativeStereotypeTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternativeStereotype/EnableAlternativeStereotypeTest.java index 11eb7eb6..c8e219e1 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternativeStereotype/EnableAlternativeStereotypeTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternativeStereotype/EnableAlternativeStereotypeTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.alternativeStereotype; +package org.jboss.weld.junit.jupiter.auto.alternativeStereotype; import jakarta.inject.Inject; -import org.jboss.weld.junit5.auto.AddBeanClasses; -import org.jboss.weld.junit5.auto.EnableAlternativeStereotypes; -import org.jboss.weld.junit5.auto.EnableAutoWeld; +import org.jboss.weld.junit.jupiter.auto.AddBeanClasses; +import org.jboss.weld.junit.jupiter.auto.EnableAlternativeStereotypes; +import org.jboss.weld.junit.jupiter.auto.EnableAutoWeld; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternativeStereotype/Foo.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternativeStereotype/Foo.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/alternativeStereotype/Foo.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternativeStereotype/Foo.java index 49c44159..fd61e21d 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternativeStereotype/Foo.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternativeStereotype/Foo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.alternativeStereotype; +package org.jboss.weld.junit.jupiter.auto.alternativeStereotype; import jakarta.enterprise.context.ApplicationScoped; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternativeStereotype/FooAlternative.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternativeStereotype/FooAlternative.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/alternativeStereotype/FooAlternative.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternativeStereotype/FooAlternative.java index 2f0e7ee2..9db0b257 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternativeStereotype/FooAlternative.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternativeStereotype/FooAlternative.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.alternativeStereotype; +package org.jboss.weld.junit.jupiter.auto.alternativeStereotype; import jakarta.enterprise.context.ApplicationScoped; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternativeStereotype/SomeStereotype.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternativeStereotype/SomeStereotype.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/alternativeStereotype/SomeStereotype.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternativeStereotype/SomeStereotype.java index 4c3aca33..387c98e9 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternativeStereotype/SomeStereotype.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternativeStereotype/SomeStereotype.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.alternativeStereotype; +package org.jboss.weld.junit.jupiter.auto.alternativeStereotype; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternatives/EnableAlternativeTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternatives/EnableAlternativeTest.java similarity index 85% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/alternatives/EnableAlternativeTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternatives/EnableAlternativeTest.java index 26e1f278..a1836f62 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternatives/EnableAlternativeTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternatives/EnableAlternativeTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.alternatives; +package org.jboss.weld.junit.jupiter.auto.alternatives; import jakarta.inject.Inject; -import org.jboss.weld.junit5.auto.AddBeanClasses; -import org.jboss.weld.junit5.auto.EnableAlternatives; -import org.jboss.weld.junit5.auto.EnableAutoWeld; +import org.jboss.weld.junit.jupiter.auto.AddBeanClasses; +import org.jboss.weld.junit.jupiter.auto.EnableAlternatives; +import org.jboss.weld.junit.jupiter.auto.EnableAutoWeld; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternatives/EnableAlternativesInheritanceTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternatives/EnableAlternativesInheritanceTest.java similarity index 86% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/alternatives/EnableAlternativesInheritanceTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternatives/EnableAlternativesInheritanceTest.java index ffd8c861..05d6b78a 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternatives/EnableAlternativesInheritanceTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternatives/EnableAlternativesInheritanceTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.alternatives; +package org.jboss.weld.junit.jupiter.auto.alternatives; import jakarta.inject.Inject; -import org.jboss.weld.junit5.auto.AddBeanClasses; -import org.jboss.weld.junit5.auto.EnableAlternatives; -import org.jboss.weld.junit5.auto.EnableAutoWeld; +import org.jboss.weld.junit.jupiter.auto.AddBeanClasses; +import org.jboss.weld.junit.jupiter.auto.EnableAlternatives; +import org.jboss.weld.junit.jupiter.auto.EnableAutoWeld; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternatives/Foo.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternatives/Foo.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/alternatives/Foo.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternatives/Foo.java index 19ee2aa9..e9973de4 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternatives/Foo.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternatives/Foo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.alternatives; +package org.jboss.weld.junit.jupiter.auto.alternatives; import jakarta.enterprise.context.ApplicationScoped; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternatives/FooAlternative.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternatives/FooAlternative.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/alternatives/FooAlternative.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternatives/FooAlternative.java index e978e5f0..728f2285 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/alternatives/FooAlternative.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/alternatives/FooAlternative.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.alternatives; +package org.jboss.weld.junit.jupiter.auto.alternatives; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Alternative; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/beans/Engine.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/Engine.java similarity index 64% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/beans/Engine.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/Engine.java index 9f6a26f2..d55fc1dc 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/beans/Engine.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/Engine.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto.beans; +package org.jboss.weld.junit.jupiter.auto.beans; public interface Engine { diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/beans/V6.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/V6.java similarity index 87% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/beans/V6.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/V6.java index 14eb0eb1..5825f522 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/beans/V6.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/V6.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto.beans; +package org.jboss.weld.junit.jupiter.auto.beans; import java.io.Serializable; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/beans/V8.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/V8.java similarity index 87% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/beans/V8.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/V8.java index d818f0c3..58e5329e 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/beans/V8.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/V8.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto.beans; +package org.jboss.weld.junit.jupiter.auto.beans; import java.io.Serializable; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/beans/unsatisfied/ConstructedV8NoAnnotation.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/unsatisfied/ConstructedV8NoAnnotation.java similarity index 82% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/beans/unsatisfied/ConstructedV8NoAnnotation.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/unsatisfied/ConstructedV8NoAnnotation.java index 8f8ca27a..7081da23 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/beans/unsatisfied/ConstructedV8NoAnnotation.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/unsatisfied/ConstructedV8NoAnnotation.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto.beans.unsatisfied; +package org.jboss.weld.junit.jupiter.auto.beans.unsatisfied; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/beans/unsatisfied/InjectedV8NoAnnotation.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/unsatisfied/InjectedV8NoAnnotation.java similarity index 74% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/beans/unsatisfied/InjectedV8NoAnnotation.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/unsatisfied/InjectedV8NoAnnotation.java index 50f0109d..c63ba627 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/beans/unsatisfied/InjectedV8NoAnnotation.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/unsatisfied/InjectedV8NoAnnotation.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto.beans.unsatisfied; +package org.jboss.weld.junit.jupiter.auto.beans.unsatisfied; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/beans/unsatisfied/V8NoAnnotation.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/unsatisfied/V8NoAnnotation.java similarity index 74% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/beans/unsatisfied/V8NoAnnotation.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/unsatisfied/V8NoAnnotation.java index 84f396ec..7b3ce8b1 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/beans/unsatisfied/V8NoAnnotation.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/beans/unsatisfied/V8NoAnnotation.java @@ -1,8 +1,8 @@ -package org.jboss.weld.junit5.auto.beans.unsatisfied; +package org.jboss.weld.junit.jupiter.auto.beans.unsatisfied; import java.io.Serializable; -import org.jboss.weld.junit5.auto.beans.Engine; +import org.jboss.weld.junit.jupiter.auto.beans.Engine; // NOTE - deliberately missing bean defining annotation public class V8NoAnnotation implements Engine, Serializable { diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/discovery/WithBeanDefiningAnnotation.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/discovery/WithBeanDefiningAnnotation.java similarity index 69% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/discovery/WithBeanDefiningAnnotation.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/discovery/WithBeanDefiningAnnotation.java index 17123076..9ea0080d 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/discovery/WithBeanDefiningAnnotation.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/discovery/WithBeanDefiningAnnotation.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto.discovery; +package org.jboss.weld.junit.jupiter.auto.discovery; import jakarta.enterprise.context.ApplicationScoped; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/discovery/WithoutBeanDefiningAnnotation.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/discovery/WithoutBeanDefiningAnnotation.java similarity index 66% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/discovery/WithoutBeanDefiningAnnotation.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/discovery/WithoutBeanDefiningAnnotation.java index aefada28..0f477b68 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/discovery/WithoutBeanDefiningAnnotation.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/discovery/WithoutBeanDefiningAnnotation.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto.discovery; +package org.jboss.weld.junit.jupiter.auto.discovery; // intentionally doesn't have any bean defining annotation public class WithoutBeanDefiningAnnotation { diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/extension/AddedExtension.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/extension/AddedExtension.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/extension/AddedExtension.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/extension/AddedExtension.java index d804541e..25cccfdd 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/extension/AddedExtension.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/extension/AddedExtension.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.extension; +package org.jboss.weld.junit.jupiter.auto.extension; import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.AfterBeanDiscovery; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/DecoratedBean.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/DecoratedBean.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/DecoratedBean.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/DecoratedBean.java index 043937d1..b3b9c9da 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/DecoratedBean.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/DecoratedBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.interceptorAndDecorator; +package org.jboss.weld.junit.jupiter.auto.interceptorAndDecorator; import jakarta.enterprise.context.Dependent; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/DecoratedBeanInterface.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/DecoratedBeanInterface.java similarity index 93% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/DecoratedBeanInterface.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/DecoratedBeanInterface.java index 57675a8d..981a654a 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/DecoratedBeanInterface.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/DecoratedBeanInterface.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.interceptorAndDecorator; +package org.jboss.weld.junit.jupiter.auto.interceptorAndDecorator; /** * diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/InterceptedBean.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/InterceptedBean.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/InterceptedBean.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/InterceptedBean.java index 7000ce61..34bf0596 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/InterceptedBean.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/InterceptedBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.interceptorAndDecorator; +package org.jboss.weld.junit.jupiter.auto.interceptorAndDecorator; import jakarta.enterprise.context.Dependent; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/TestDecorator.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/TestDecorator.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/TestDecorator.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/TestDecorator.java index a9e797f8..f205915b 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/TestDecorator.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/TestDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.interceptorAndDecorator; +package org.jboss.weld.junit.jupiter.auto.interceptorAndDecorator; import jakarta.decorator.Decorator; import jakarta.decorator.Delegate; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/TestInterceptor.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/TestInterceptor.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/TestInterceptor.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/TestInterceptor.java index 078751ac..e9ea74fb 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/TestInterceptor.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/TestInterceptor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.interceptorAndDecorator; +package org.jboss.weld.junit.jupiter.auto.interceptorAndDecorator; import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/TestInterceptorBinding.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/TestInterceptorBinding.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/TestInterceptorBinding.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/TestInterceptorBinding.java index c36ca07e..af98d242 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/interceptorAndDecorator/TestInterceptorBinding.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/interceptorAndDecorator/TestInterceptorBinding.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.auto.interceptorAndDecorator; +package org.jboss.weld.junit.jupiter.auto.interceptorAndDecorator; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/nested/OuterTestClassAndBeanSameInstanceTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/nested/OuterTestClassAndBeanSameInstanceTest.java similarity index 97% rename from junit5/src/test/java/org/jboss/weld/junit5/auto/nested/OuterTestClassAndBeanSameInstanceTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/nested/OuterTestClassAndBeanSameInstanceTest.java index 532a2dbc..7a1bed74 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/auto/nested/OuterTestClassAndBeanSameInstanceTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/auto/nested/OuterTestClassAndBeanSameInstanceTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.auto.nested; +package org.jboss.weld.junit.jupiter.auto.nested; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -12,7 +12,7 @@ import jakarta.enterprise.inject.Produces; import jakarta.inject.Inject; -import org.jboss.weld.junit5.auto.EnableAutoWeld; +import org.jboss.weld.junit.jupiter.auto.EnableAutoWeld; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/basic/BeanManagerTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/BeanManagerTest.java similarity index 86% rename from junit5/src/test/java/org/jboss/weld/junit5/basic/BeanManagerTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/BeanManagerTest.java index e75fce52..5073fa5b 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/basic/BeanManagerTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/BeanManagerTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.basic; +package org.jboss.weld.junit.jupiter.basic; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/basic/ContainerNotRunningTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/ContainerNotRunningTest.java similarity index 87% rename from junit5/src/test/java/org/jboss/weld/junit5/basic/ContainerNotRunningTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/ContainerNotRunningTest.java index 1357a38e..da285057 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/basic/ContainerNotRunningTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/ContainerNotRunningTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.basic; +package org.jboss.weld.junit.jupiter.basic; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/basic/CustomWeldTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/CustomWeldTest.java similarity index 87% rename from junit5/src/test/java/org/jboss/weld/junit5/basic/CustomWeldTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/CustomWeldTest.java index 73a347f7..372427a3 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/basic/CustomWeldTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/CustomWeldTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.basic; +package org.jboss.weld.junit.jupiter.basic; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/basic/DisabledMethodsTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/DisabledMethodsTest.java similarity index 89% rename from junit5/src/test/java/org/jboss/weld/junit5/basic/DisabledMethodsTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/DisabledMethodsTest.java index b3da2cf2..e603a861 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/basic/DisabledMethodsTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/DisabledMethodsTest.java @@ -1,12 +1,12 @@ -package org.jboss.weld.junit5.basic; +package org.jboss.weld.junit.jupiter.basic; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import org.jboss.weld.environment.se.WeldContainer; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/basic/EnableWeldTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/EnableWeldTest.java similarity index 84% rename from junit5/src/test/java/org/jboss/weld/junit5/basic/EnableWeldTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/EnableWeldTest.java index 984e8a7c..f3923683 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/basic/EnableWeldTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/EnableWeldTest.java @@ -1,11 +1,11 @@ -package org.jboss.weld.junit5.basic; +package org.jboss.weld.junit.jupiter.basic; import static org.junit.jupiter.api.Assertions.assertNotNull; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; -import org.jboss.weld.junit5.EnableWeld; +import org.jboss.weld.junit.jupiter.EnableWeld; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/basic/Foo.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/Foo.java similarity index 96% rename from junit5/src/test/java/org/jboss/weld/junit5/basic/Foo.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/Foo.java index e8c73e03..40b5e1b7 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/basic/Foo.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/Foo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.basic; +package org.jboss.weld.junit.jupiter.basic; import jakarta.annotation.PostConstruct; import jakarta.enterprise.context.ApplicationScoped; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/basic/FooAlternative.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/FooAlternative.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/basic/FooAlternative.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/FooAlternative.java index 85d98b7c..1aacdd9a 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/basic/FooAlternative.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/FooAlternative.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.basic; +package org.jboss.weld.junit.jupiter.basic; import jakarta.enterprise.inject.Alternative; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/basic/IFoo.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/IFoo.java similarity index 53% rename from junit5/src/test/java/org/jboss/weld/junit5/basic/IFoo.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/IFoo.java index 4f245a55..93fb880d 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/basic/IFoo.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/IFoo.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.basic; +package org.jboss.weld.junit.jupiter.basic; public interface IFoo { diff --git a/junit5/src/test/java/org/jboss/weld/junit5/basic/SimpleTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/SimpleTest.java similarity index 88% rename from junit5/src/test/java/org/jboss/weld/junit5/basic/SimpleTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/SimpleTest.java index 97977110..dbf8146b 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/basic/SimpleTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/SimpleTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.basic; +package org.jboss.weld.junit.jupiter.basic; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import jakarta.inject.Inject; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; -import org.jboss.weld.junit5.ofpackage.Alpha; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; +import org.jboss.weld.junit.jupiter.ofpackage.Alpha; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/basic/SomeFoo.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/SomeFoo.java similarity index 78% rename from junit5/src/test/java/org/jboss/weld/junit5/basic/SomeFoo.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/SomeFoo.java index 4992bc52..ae945e78 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/basic/SomeFoo.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/SomeFoo.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.basic; +package org.jboss.weld.junit.jupiter.basic; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/basic/SomeIFoo.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/SomeIFoo.java similarity index 79% rename from junit5/src/test/java/org/jboss/weld/junit5/basic/SomeIFoo.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/SomeIFoo.java index 3c089eb5..3f908f1e 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/basic/SomeIFoo.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/SomeIFoo.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.basic; +package org.jboss.weld.junit.jupiter.basic; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/basic/unsatisfied/Baz.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/unsatisfied/Baz.java similarity index 83% rename from junit5/src/test/java/org/jboss/weld/junit5/basic/unsatisfied/Baz.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/unsatisfied/Baz.java index 07234f6e..4caf41ea 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/basic/unsatisfied/Baz.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/unsatisfied/Baz.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.basic.unsatisfied; +package org.jboss.weld.junit.jupiter.basic.unsatisfied; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/basic/unsatisfied/FooDeps.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/unsatisfied/FooDeps.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/basic/unsatisfied/FooDeps.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/unsatisfied/FooDeps.java index 7c2c14af..494d4d3c 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/basic/unsatisfied/FooDeps.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/unsatisfied/FooDeps.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.basic.unsatisfied; +package org.jboss.weld.junit.jupiter.basic.unsatisfied; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/basic/unsatisfied/SomeFooDeps.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/unsatisfied/SomeFooDeps.java similarity index 75% rename from junit5/src/test/java/org/jboss/weld/junit5/basic/unsatisfied/SomeFooDeps.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/unsatisfied/SomeFooDeps.java index 00e16c46..2081e59f 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/basic/unsatisfied/SomeFooDeps.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/basic/unsatisfied/SomeFooDeps.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.basic.unsatisfied; +package org.jboss.weld.junit.jupiter.basic.unsatisfied; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/bean/AddBeanTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/AddBeanTest.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/bean/AddBeanTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/AddBeanTest.java index 88040b2e..4759b5a2 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/bean/AddBeanTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/AddBeanTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.bean; +package org.jboss.weld.junit.jupiter.bean; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -32,9 +32,9 @@ import jakarta.enterprise.util.TypeLiteral; import org.jboss.weld.junit.MockBean; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/bean/AddGloballyEnabledAlternativeTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/AddGloballyEnabledAlternativeTest.java similarity index 91% rename from junit5/src/test/java/org/jboss/weld/junit5/bean/AddGloballyEnabledAlternativeTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/AddGloballyEnabledAlternativeTest.java index 3d31a294..7ef96034 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/bean/AddGloballyEnabledAlternativeTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/AddGloballyEnabledAlternativeTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.bean; +package org.jboss.weld.junit.jupiter.bean; import java.util.List; import java.util.Set; @@ -7,9 +7,9 @@ import jakarta.enterprise.util.TypeLiteral; import org.jboss.weld.junit.MockBean; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/bean/AddPassivatingBeanTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/AddPassivatingBeanTest.java similarity index 91% rename from junit5/src/test/java/org/jboss/weld/junit5/bean/AddPassivatingBeanTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/AddPassivatingBeanTest.java index 048d1197..a3d15db6 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/bean/AddPassivatingBeanTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/AddPassivatingBeanTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.bean; +package org.jboss.weld.junit.jupiter.bean; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -26,9 +26,9 @@ import jakarta.enterprise.util.TypeLiteral; import org.jboss.weld.junit.MockBean; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/bean/AlternativeMockBeanTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/AlternativeMockBeanTest.java similarity index 90% rename from junit5/src/test/java/org/jboss/weld/junit5/bean/AlternativeMockBeanTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/AlternativeMockBeanTest.java index 719537b1..2035bb9b 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/bean/AlternativeMockBeanTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/AlternativeMockBeanTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.bean; +package org.jboss.weld.junit.jupiter.bean; import jakarta.enterprise.context.Dependent; import org.jboss.weld.junit.MockBean; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/bean/Bar.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/Bar.java similarity index 89% rename from junit5/src/test/java/org/jboss/weld/junit5/bean/Bar.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/Bar.java index f277548a..edc86c92 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/bean/Bar.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/Bar.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.bean; +package org.jboss.weld.junit.jupiter.bean; import java.util.List; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/bean/Blue.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/Blue.java similarity index 96% rename from junit5/src/test/java/org/jboss/weld/junit5/bean/Blue.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/Blue.java index 77920478..68e830fa 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/bean/Blue.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/Blue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.bean; +package org.jboss.weld.junit.jupiter.bean; import java.util.List; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/bean/BlueToDiscover.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/BlueToDiscover.java similarity index 96% rename from junit5/src/test/java/org/jboss/weld/junit5/bean/BlueToDiscover.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/BlueToDiscover.java index 0e9e73cc..a2f20e74 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/bean/BlueToDiscover.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/BlueToDiscover.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.bean; +package org.jboss.weld.junit.jupiter.bean; import java.util.UUID; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/bean/Foo.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/Foo.java similarity index 64% rename from junit5/src/test/java/org/jboss/weld/junit5/bean/Foo.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/Foo.java index 2032697b..1779c395 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/bean/Foo.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/Foo.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.bean; +package org.jboss.weld.junit.jupiter.bean; public class Foo { diff --git a/junit5/src/test/java/org/jboss/weld/junit5/bean/Meaty.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/Meaty.java similarity index 97% rename from junit5/src/test/java/org/jboss/weld/junit5/bean/Meaty.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/Meaty.java index 9a4c2cf3..d5306dae 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/bean/Meaty.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/Meaty.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.bean; +package org.jboss.weld.junit.jupiter.bean; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/bean/MockBeanWithQualifiersTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/MockBeanWithQualifiersTest.java similarity index 79% rename from junit5/src/test/java/org/jboss/weld/junit5/bean/MockBeanWithQualifiersTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/MockBeanWithQualifiersTest.java index 46be0655..7d5184f2 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/bean/MockBeanWithQualifiersTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/MockBeanWithQualifiersTest.java @@ -1,11 +1,11 @@ -package org.jboss.weld.junit5.bean; +package org.jboss.weld.junit.jupiter.bean; import jakarta.enterprise.inject.Any; import org.jboss.weld.junit.MockBean; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/bean/TestClassProducerTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/TestClassProducerTest.java similarity index 90% rename from junit5/src/test/java/org/jboss/weld/junit5/bean/TestClassProducerTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/TestClassProducerTest.java index 999dc08d..d3c0dbae 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/bean/TestClassProducerTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/TestClassProducerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.bean; +package org.jboss.weld.junit.jupiter.bean; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -25,9 +25,9 @@ import jakarta.enterprise.inject.Produces; import jakarta.enterprise.util.TypeLiteral; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/bean/extension/AddExtensionAsBeanClassWithFromMethodTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/extension/AddExtensionAsBeanClassWithFromMethodTest.java similarity index 89% rename from junit5/src/test/java/org/jboss/weld/junit5/bean/extension/AddExtensionAsBeanClassWithFromMethodTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/extension/AddExtensionAsBeanClassWithFromMethodTest.java index 1c73b3ca..5c670b5d 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/bean/extension/AddExtensionAsBeanClassWithFromMethodTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/extension/AddExtensionAsBeanClassWithFromMethodTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.bean.extension; +package org.jboss.weld.junit.jupiter.bean.extension; import org.jboss.weld.inject.WeldInstance; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/bean/extension/AddExtensionAsBeanClassWithOfMethodTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/extension/AddExtensionAsBeanClassWithOfMethodTest.java similarity index 89% rename from junit5/src/test/java/org/jboss/weld/junit5/bean/extension/AddExtensionAsBeanClassWithOfMethodTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/extension/AddExtensionAsBeanClassWithOfMethodTest.java index 64cb24c8..b616bb7d 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/bean/extension/AddExtensionAsBeanClassWithOfMethodTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/extension/AddExtensionAsBeanClassWithOfMethodTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.bean.extension; +package org.jboss.weld.junit.jupiter.bean.extension; import org.jboss.weld.inject.WeldInstance; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/bean/extension/GoodOldBean.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/extension/GoodOldBean.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/bean/extension/GoodOldBean.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/extension/GoodOldBean.java index 4ab95fc4..dd77665f 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/bean/extension/GoodOldBean.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/extension/GoodOldBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.bean.extension; +package org.jboss.weld.junit.jupiter.bean.extension; import jakarta.enterprise.context.ApplicationScoped; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/bean/extension/MyExtension.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/extension/MyExtension.java similarity index 96% rename from junit5/src/test/java/org/jboss/weld/junit5/bean/extension/MyExtension.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/extension/MyExtension.java index 6fd97e99..2891e0d7 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/bean/extension/MyExtension.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/bean/extension/MyExtension.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.bean.extension; +package org.jboss.weld.junit.jupiter.bean.extension; import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.Extension; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/compat/JunitParameterResolverAutoWeldTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/compat/JunitParameterResolverAutoWeldTest.java similarity index 51% rename from junit5/src/test/java/org/jboss/weld/junit5/compat/JunitParameterResolverAutoWeldTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/compat/JunitParameterResolverAutoWeldTest.java index e1440a9a..83587e88 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/compat/JunitParameterResolverAutoWeldTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/compat/JunitParameterResolverAutoWeldTest.java @@ -1,6 +1,6 @@ -package org.jboss.weld.junit5.compat; +package org.jboss.weld.junit.jupiter.compat; -import org.jboss.weld.junit5.auto.EnableAutoWeld; +import org.jboss.weld.junit.jupiter.auto.EnableAutoWeld; @EnableAutoWeld class JunitParameterResolverAutoWeldTest extends JunitParameterResolverReferenceTest { diff --git a/junit5/src/test/java/org/jboss/weld/junit5/compat/JunitParameterResolverReferenceTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/compat/JunitParameterResolverReferenceTest.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/compat/JunitParameterResolverReferenceTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/compat/JunitParameterResolverReferenceTest.java index aac9265d..87556f7d 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/compat/JunitParameterResolverReferenceTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/compat/JunitParameterResolverReferenceTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.compat; +package org.jboss.weld.junit.jupiter.compat; import java.nio.file.Path; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/compat/JunitParameterResolverWeldTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/compat/JunitParameterResolverWeldTest.java similarity index 51% rename from junit5/src/test/java/org/jboss/weld/junit5/compat/JunitParameterResolverWeldTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/compat/JunitParameterResolverWeldTest.java index d6b34640..8ef97266 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/compat/JunitParameterResolverWeldTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/compat/JunitParameterResolverWeldTest.java @@ -1,6 +1,6 @@ -package org.jboss.weld.junit5.compat; +package org.jboss.weld.junit.jupiter.compat; -import org.jboss.weld.junit5.EnableWeld; +import org.jboss.weld.junit.jupiter.EnableWeld; @EnableWeld class JunitParameterResolverWeldTest extends JunitParameterResolverReferenceTest { diff --git a/junit5/src/test/java/org/jboss/weld/junit5/contexts/ContextsActivatedTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/ContextsActivatedTest.java similarity index 89% rename from junit5/src/test/java/org/jboss/weld/junit5/contexts/ContextsActivatedTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/ContextsActivatedTest.java index 602f8838..006de6f6 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/contexts/ContextsActivatedTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/ContextsActivatedTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.contexts; +package org.jboss.weld.junit.jupiter.contexts; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.SessionScoped; import jakarta.inject.Inject; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/contexts/Foo.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/Foo.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/contexts/Foo.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/Foo.java index 7e03e106..4a3808c0 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/contexts/Foo.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/Foo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.contexts; +package org.jboss.weld.junit.jupiter.contexts; import java.util.UUID; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/contexts/InvalidScopeTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/InvalidScopeTest.java similarity index 89% rename from junit5/src/test/java/org/jboss/weld/junit5/contexts/InvalidScopeTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/InvalidScopeTest.java index fcb1ec99..1836b1d3 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/contexts/InvalidScopeTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/InvalidScopeTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.contexts; +package org.jboss.weld.junit.jupiter.contexts; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/contexts/Oof.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/Oof.java similarity index 96% rename from junit5/src/test/java/org/jboss/weld/junit5/contexts/Oof.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/Oof.java index aa9c8623..0223cdc0 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/contexts/Oof.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/Oof.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.contexts; +package org.jboss.weld.junit.jupiter.contexts; import java.io.Serializable; import java.util.UUID; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/contexts/RequestScopedProducer.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/RequestScopedProducer.java similarity index 86% rename from junit5/src/test/java/org/jboss/weld/junit5/contexts/RequestScopedProducer.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/RequestScopedProducer.java index 47e20b4f..ec6bd752 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/contexts/RequestScopedProducer.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/RequestScopedProducer.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.contexts; +package org.jboss.weld.junit.jupiter.contexts; import jakarta.enterprise.context.Dependent; import jakarta.enterprise.context.RequestScoped; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/contexts/SomeAnnotation.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/SomeAnnotation.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/contexts/SomeAnnotation.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/SomeAnnotation.java index e06966bc..729d5c7f 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/contexts/SomeAnnotation.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/SomeAnnotation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.contexts; +package org.jboss.weld.junit.jupiter.contexts; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/contexts/events/ContextLifecycleEventsObserver.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/events/ContextLifecycleEventsObserver.java similarity index 97% rename from junit5/src/test/java/org/jboss/weld/junit5/contexts/events/ContextLifecycleEventsObserver.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/events/ContextLifecycleEventsObserver.java index f8b886bb..c0581569 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/contexts/events/ContextLifecycleEventsObserver.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/events/ContextLifecycleEventsObserver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.contexts.events; +package org.jboss.weld.junit.jupiter.contexts.events; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/contexts/events/ContextLifecycleEventsTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/events/ContextLifecycleEventsTest.java similarity index 91% rename from junit5/src/test/java/org/jboss/weld/junit5/contexts/events/ContextLifecycleEventsTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/events/ContextLifecycleEventsTest.java index 56776e11..a45cc30b 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/contexts/events/ContextLifecycleEventsTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/contexts/events/ContextLifecycleEventsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.contexts.events; +package org.jboss.weld.junit.jupiter.contexts.events; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -23,9 +23,9 @@ import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.SessionScoped; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/enricher/FooWeldJunitEnricher.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/enricher/FooWeldJunitEnricher.java similarity index 81% rename from junit5/src/test/java/org/jboss/weld/junit5/enricher/FooWeldJunitEnricher.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/enricher/FooWeldJunitEnricher.java index b2edd397..7f5cb1f2 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/enricher/FooWeldJunitEnricher.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/enricher/FooWeldJunitEnricher.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.enricher; +package org.jboss.weld.junit.jupiter.enricher; import org.jboss.weld.environment.se.Weld; -import org.jboss.weld.junit5.WeldInitiator.Builder; -import org.jboss.weld.junit5.WeldJunitEnricher; -import org.jboss.weld.junit5.basic.Foo; -import org.jboss.weld.junit5.enricher.disabled.WeldJunitEnricherDisabledTest; +import org.jboss.weld.junit.jupiter.WeldInitiator.Builder; +import org.jboss.weld.junit.jupiter.WeldJunitEnricher; +import org.jboss.weld.junit.jupiter.basic.Foo; +import org.jboss.weld.junit.jupiter.enricher.disabled.WeldJunitEnricherDisabledTest; import org.junit.jupiter.api.extension.ExtensionContext; public class FooWeldJunitEnricher implements WeldJunitEnricher { diff --git a/junit5/src/test/java/org/jboss/weld/junit5/enricher/WeldJunitEnricherTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/enricher/WeldJunitEnricherTest.java similarity index 90% rename from junit5/src/test/java/org/jboss/weld/junit5/enricher/WeldJunitEnricherTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/enricher/WeldJunitEnricherTest.java index 75ecfa40..7ad609c5 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/enricher/WeldJunitEnricherTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/enricher/WeldJunitEnricherTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.enricher; +package org.jboss.weld.junit.jupiter.enricher; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ; @@ -22,8 +22,8 @@ import jakarta.inject.Inject; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.basic.Foo; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.basic.Foo; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.ResourceLock; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/enricher/disabled/WeldJunitEnricherDisabledTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/enricher/disabled/WeldJunitEnricherDisabledTest.java similarity index 88% rename from junit5/src/test/java/org/jboss/weld/junit5/enricher/disabled/WeldJunitEnricherDisabledTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/enricher/disabled/WeldJunitEnricherDisabledTest.java index 934d4441..7ce57c37 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/enricher/disabled/WeldJunitEnricherDisabledTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/enricher/disabled/WeldJunitEnricherDisabledTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.enricher.disabled; +package org.jboss.weld.junit.jupiter.enricher.disabled; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES; @@ -22,9 +22,9 @@ import jakarta.enterprise.inject.Instance; import jakarta.inject.Inject; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.basic.Foo; -import org.jboss.weld.junit5.enricher.FooWeldJunitEnricher; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.basic.Foo; +import org.jboss.weld.junit.jupiter.enricher.FooWeldJunitEnricher; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/event/DummyObserver.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/event/DummyObserver.java similarity index 92% rename from junit5/src/test/java/org/jboss/weld/junit5/event/DummyObserver.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/event/DummyObserver.java index 723c6bc9..4ad0115c 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/event/DummyObserver.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/event/DummyObserver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.event; +package org.jboss.weld.junit.jupiter.event; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -22,7 +22,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.event.Observes; -import org.jboss.weld.junit5.basic.Foo; +import org.jboss.weld.junit.jupiter.basic.Foo; @ApplicationScoped public class DummyObserver { diff --git a/junit5/src/test/java/org/jboss/weld/junit5/event/FireEventTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/event/FireEventTest.java similarity index 85% rename from junit5/src/test/java/org/jboss/weld/junit5/event/FireEventTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/event/FireEventTest.java index 16ea887d..9413afac 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/event/FireEventTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/event/FireEventTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.event; +package org.jboss.weld.junit.jupiter.event; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; -import org.jboss.weld.junit5.basic.Foo; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; +import org.jboss.weld.junit.jupiter.basic.Foo; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/Bar.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/Bar.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/Bar.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/Bar.java index 0225e98e..bae26f51 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/Bar.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/Bar.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.explicitInjection; +package org.jboss.weld.junit.jupiter.explicitInjection; import jakarta.enterprise.context.ApplicationScoped; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/BeanWithQualifier.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/BeanWithQualifier.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/BeanWithQualifier.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/BeanWithQualifier.java index bf6df3e3..eb4afbeb 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/BeanWithQualifier.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/BeanWithQualifier.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.explicitInjection; +package org.jboss.weld.junit.jupiter.explicitInjection; import jakarta.enterprise.context.ApplicationScoped; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/CustomExtension.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/CustomExtension.java similarity index 97% rename from junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/CustomExtension.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/CustomExtension.java index e0477030..34528b5b 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/CustomExtension.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/CustomExtension.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.explicitInjection; +package org.jboss.weld.junit.jupiter.explicitInjection; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/ExplicitParameterInjectionNestedClass2Test.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/ExplicitParameterInjectionNestedClass2Test.java similarity index 96% rename from junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/ExplicitParameterInjectionNestedClass2Test.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/ExplicitParameterInjectionNestedClass2Test.java index 3f83ff01..264e152e 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/ExplicitParameterInjectionNestedClass2Test.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/ExplicitParameterInjectionNestedClass2Test.java @@ -1,9 +1,9 @@ -package org.jboss.weld.junit5.explicitInjection; +package org.jboss.weld.junit.jupiter.explicitInjection; import jakarta.enterprise.inject.Default; -import org.jboss.weld.junit5.ExplicitParamInjection; -import org.jboss.weld.junit5.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.ExplicitParamInjection; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/ExplicitParameterInjectionNestedClassTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/ExplicitParameterInjectionNestedClassTest.java similarity index 96% rename from junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/ExplicitParameterInjectionNestedClassTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/ExplicitParameterInjectionNestedClassTest.java index 030255f5..a9c0c578 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/ExplicitParameterInjectionNestedClassTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/ExplicitParameterInjectionNestedClassTest.java @@ -1,9 +1,9 @@ -package org.jboss.weld.junit5.explicitInjection; +package org.jboss.weld.junit.jupiter.explicitInjection; import jakarta.enterprise.inject.Default; -import org.jboss.weld.junit5.ExplicitParamInjection; -import org.jboss.weld.junit5.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.ExplicitParamInjection; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/ExplicitParameterInjectionViaClassAnnotationTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/ExplicitParameterInjectionViaClassAnnotationTest.java similarity index 91% rename from junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/ExplicitParameterInjectionViaClassAnnotationTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/ExplicitParameterInjectionViaClassAnnotationTest.java index 647a367e..345a0e84 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/ExplicitParameterInjectionViaClassAnnotationTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/ExplicitParameterInjectionViaClassAnnotationTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.explicitInjection; +package org.jboss.weld.junit.jupiter.explicitInjection; import jakarta.enterprise.inject.Default; -import org.jboss.weld.junit5.ExplicitParamInjection; -import org.jboss.weld.junit5.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.ExplicitParamInjection; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/ExplicitParameterInjectionViaMethodAnnotationTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/ExplicitParameterInjectionViaMethodAnnotationTest.java similarity index 93% rename from junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/ExplicitParameterInjectionViaMethodAnnotationTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/ExplicitParameterInjectionViaMethodAnnotationTest.java index f6986824..20def98e 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/ExplicitParameterInjectionViaMethodAnnotationTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/ExplicitParameterInjectionViaMethodAnnotationTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.explicitInjection; +package org.jboss.weld.junit.jupiter.explicitInjection; import jakarta.enterprise.inject.Default; -import org.jboss.weld.junit5.ExplicitParamInjection; -import org.jboss.weld.junit5.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.ExplicitParamInjection; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/ExplicitParameterInjectionViaPropertyTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/ExplicitParameterInjectionViaPropertyTest.java similarity index 93% rename from junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/ExplicitParameterInjectionViaPropertyTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/ExplicitParameterInjectionViaPropertyTest.java index 1d1cdabb..aa6ed2f0 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/ExplicitParameterInjectionViaPropertyTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/ExplicitParameterInjectionViaPropertyTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.explicitInjection; +package org.jboss.weld.junit.jupiter.explicitInjection; import jakarta.enterprise.inject.Default; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/Foo.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/Foo.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/Foo.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/Foo.java index f211dd3c..0269b7cc 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/Foo.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/Foo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.explicitInjection; +package org.jboss.weld.junit.jupiter.explicitInjection; import jakarta.enterprise.context.Dependent; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/MyQualifier.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/MyQualifier.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/MyQualifier.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/MyQualifier.java index 885a053e..a52e3380 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/MyQualifier.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/MyQualifier.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.explicitInjection; +package org.jboss.weld.junit.jupiter.explicitInjection; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/parameterizedTest/Foo.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/parameterizedTest/Foo.java similarity index 77% rename from junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/parameterizedTest/Foo.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/parameterizedTest/Foo.java index 8c686a9b..c73aef85 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/parameterizedTest/Foo.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/parameterizedTest/Foo.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.explicitInjection.parameterizedTest; +package org.jboss.weld.junit.jupiter.explicitInjection.parameterizedTest; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Produces; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/parameterizedTest/ParameterizedTestExplicitInjectionTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/parameterizedTest/ParameterizedTestExplicitInjectionTest.java similarity index 93% rename from junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/parameterizedTest/ParameterizedTestExplicitInjectionTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/parameterizedTest/ParameterizedTestExplicitInjectionTest.java index a4f6b44e..e1923ff6 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/explicitInjection/parameterizedTest/ParameterizedTestExplicitInjectionTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/explicitInjection/parameterizedTest/ParameterizedTestExplicitInjectionTest.java @@ -1,10 +1,10 @@ -package org.jboss.weld.junit5.explicitInjection.parameterizedTest; +package org.jboss.weld.junit.jupiter.explicitInjection.parameterizedTest; import java.util.Set; import jakarta.enterprise.inject.Default; -import org.jboss.weld.junit5.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/BarBean.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/BarBean.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/BarBean.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/BarBean.java index 7ccbf390..1f3dc6fb 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/BarBean.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/BarBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.extensionInjection; +package org.jboss.weld.junit.jupiter.extensionInjection; import jakarta.enterprise.context.ApplicationScoped; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/FooBean.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/FooBean.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/FooBean.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/FooBean.java index a789f0dc..1617d365 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/FooBean.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/FooBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.extensionInjection; +package org.jboss.weld.junit.jupiter.extensionInjection; import jakarta.enterprise.context.Dependent; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/JUnit5ExtensionTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/JUnit5ExtensionTest.java similarity index 96% rename from junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/JUnit5ExtensionTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/JUnit5ExtensionTest.java index 3c58aa16..c109c826 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/JUnit5ExtensionTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/JUnit5ExtensionTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.extensionInjection; +package org.jboss.weld.junit.jupiter.extensionInjection; import java.util.Map; @@ -22,7 +22,7 @@ import jakarta.enterprise.inject.Instance; import jakarta.inject.Inject; -import org.jboss.weld.junit5.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/MapProducer.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/MapProducer.java similarity index 89% rename from junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/MapProducer.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/MapProducer.java index 3018b508..6a1ad1f7 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/MapProducer.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/MapProducer.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.extensionInjection; +package org.jboss.weld.junit.jupiter.extensionInjection; import java.util.HashMap; import java.util.Map; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/MyQualifier.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/MyQualifier.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/MyQualifier.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/MyQualifier.java index e666e240..0401c2df 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/MyQualifier.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/MyQualifier.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.extensionInjection; +package org.jboss.weld.junit.jupiter.extensionInjection; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/SomeBean.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/SomeBean.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/SomeBean.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/SomeBean.java index f59ba08f..03618c87 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/extensionInjection/SomeBean.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/extensionInjection/SomeBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.extensionInjection; +package org.jboss.weld.junit.jupiter.extensionInjection; import jakarta.enterprise.context.ApplicationScoped; diff --git a/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/bean/Bar.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/bean/Bar.java new file mode 100644 index 00000000..4279b4ed --- /dev/null +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/bean/Bar.java @@ -0,0 +1,4 @@ +package org.jboss.weld.junit.jupiter.initiator.bean; + +public class Bar { +} diff --git a/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/bean/Foo.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/bean/Foo.java new file mode 100644 index 00000000..184a26b8 --- /dev/null +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/bean/Foo.java @@ -0,0 +1,5 @@ +package org.jboss.weld.junit.jupiter.initiator.bean; + +public class Foo { + +} diff --git a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/NestedClassesWeldInitiatorTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/NestedClassesWeldInitiatorTest.java similarity index 91% rename from junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/NestedClassesWeldInitiatorTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/NestedClassesWeldInitiatorTest.java index af570233..e8b37eeb 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/NestedClassesWeldInitiatorTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/NestedClassesWeldInitiatorTest.java @@ -1,13 +1,13 @@ -package org.jboss.weld.junit5.initiator.discovery; +package org.jboss.weld.junit.jupiter.initiator.discovery; import jakarta.inject.Inject; import org.jboss.weld.exceptions.UnsatisfiedResolutionException; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldSetup; -import org.jboss.weld.junit5.initiator.bean.Bar; -import org.jboss.weld.junit5.initiator.bean.Foo; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldSetup; +import org.jboss.weld.junit.jupiter.initiator.bean.Bar; +import org.jboss.weld.junit.jupiter.initiator.bean.Foo; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/ObjectWeldInitiatorTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/ObjectWeldInitiatorTest.java similarity index 83% rename from junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/ObjectWeldInitiatorTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/ObjectWeldInitiatorTest.java index cfc5c630..204a044c 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/ObjectWeldInitiatorTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/ObjectWeldInitiatorTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.initiator.discovery; +package org.jboss.weld.junit.jupiter.initiator.discovery; import static org.junit.jupiter.api.Assertions.assertNotNull; import org.jboss.weld.environment.se.Weld; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldSetup; -import org.jboss.weld.junit5.initiator.bean.Foo; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldSetup; +import org.jboss.weld.junit.jupiter.initiator.bean.Foo; import org.junit.jupiter.api.Test; /** diff --git a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/PrivateWeldInitiatorInSuperclassTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/PrivateWeldInitiatorInSuperclassTest.java similarity index 89% rename from junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/PrivateWeldInitiatorInSuperclassTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/PrivateWeldInitiatorInSuperclassTest.java index a770c4fd..da9329ab 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/PrivateWeldInitiatorInSuperclassTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/PrivateWeldInitiatorInSuperclassTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.initiator.discovery; +package org.jboss.weld.junit.jupiter.initiator.discovery; import static org.junit.jupiter.api.Assertions.assertNotNull; import org.jboss.weld.environment.se.WeldContainer; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.initiator.bean.Foo; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.initiator.bean.Foo; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/PrivateWeldInitiatorTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/PrivateWeldInitiatorTest.java similarity index 84% rename from junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/PrivateWeldInitiatorTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/PrivateWeldInitiatorTest.java index 1ac94b4c..eeaf0df5 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/PrivateWeldInitiatorTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/PrivateWeldInitiatorTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.initiator.discovery; +package org.jboss.weld.junit.jupiter.initiator.discovery; import static org.junit.jupiter.api.Assertions.assertNotNull; import org.jboss.weld.environment.se.Weld; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldSetup; -import org.jboss.weld.junit5.initiator.bean.Foo; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldSetup; +import org.jboss.weld.junit.jupiter.initiator.bean.Foo; import org.junit.jupiter.api.Test; /** diff --git a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/ProtectedWeldInitiatorInSuperclassTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/ProtectedWeldInitiatorInSuperclassTest.java similarity index 88% rename from junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/ProtectedWeldInitiatorInSuperclassTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/ProtectedWeldInitiatorInSuperclassTest.java index 5d9af3c1..d1bf821c 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/ProtectedWeldInitiatorInSuperclassTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/ProtectedWeldInitiatorInSuperclassTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.initiator.discovery; +package org.jboss.weld.junit.jupiter.initiator.discovery; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.initiator.bean.Foo; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.initiator.bean.Foo; import org.junit.jupiter.api.Test; /** diff --git a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/SubclassWithWeldInitiatorTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/SubclassWithWeldInitiatorTest.java similarity index 73% rename from junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/SubclassWithWeldInitiatorTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/SubclassWithWeldInitiatorTest.java index e6e05736..a94b3f92 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/SubclassWithWeldInitiatorTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/SubclassWithWeldInitiatorTest.java @@ -1,8 +1,8 @@ -package org.jboss.weld.junit5.initiator.discovery; +package org.jboss.weld.junit.jupiter.initiator.discovery; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.jboss.weld.junit5.initiator.bean.Foo; +import org.jboss.weld.junit.jupiter.initiator.bean.Foo; import org.junit.jupiter.api.Test; public class SubclassWithWeldInitiatorTest extends SuperclassWithWeldInitiator { diff --git a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/SuperclassWithPrivateWeldInitiator.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/SuperclassWithPrivateWeldInitiator.java similarity index 83% rename from junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/SuperclassWithPrivateWeldInitiator.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/SuperclassWithPrivateWeldInitiator.java index eb56d9ab..71c6129c 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/SuperclassWithPrivateWeldInitiator.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/SuperclassWithPrivateWeldInitiator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.initiator.discovery; +package org.jboss.weld.junit.jupiter.initiator.discovery; import org.jboss.weld.environment.se.Weld; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldSetup; -import org.jboss.weld.junit5.initiator.bean.Foo; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldSetup; +import org.jboss.weld.junit.jupiter.initiator.bean.Foo; /** * diff --git a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/SuperclassWithProtectedWeldInitiator.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/SuperclassWithProtectedWeldInitiator.java similarity index 83% rename from junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/SuperclassWithProtectedWeldInitiator.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/SuperclassWithProtectedWeldInitiator.java index 3e218bf3..03f601cf 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/SuperclassWithProtectedWeldInitiator.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/SuperclassWithProtectedWeldInitiator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.initiator.discovery; +package org.jboss.weld.junit.jupiter.initiator.discovery; import org.jboss.weld.environment.se.Weld; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldSetup; -import org.jboss.weld.junit5.initiator.bean.Foo; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldSetup; +import org.jboss.weld.junit.jupiter.initiator.bean.Foo; /** * diff --git a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/SuperclassWithWeldInitiator.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/SuperclassWithWeldInitiator.java similarity index 54% rename from junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/SuperclassWithWeldInitiator.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/SuperclassWithWeldInitiator.java index 05777d6d..0c4f7512 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/initiator/discovery/SuperclassWithWeldInitiator.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/initiator/discovery/SuperclassWithWeldInitiator.java @@ -1,10 +1,10 @@ -package org.jboss.weld.junit5.initiator.discovery; +package org.jboss.weld.junit.jupiter.initiator.discovery; import org.jboss.weld.environment.se.Weld; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; -import org.jboss.weld.junit5.initiator.bean.Foo; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; +import org.jboss.weld.junit.jupiter.initiator.bean.Foo; import org.junit.jupiter.api.extension.ExtendWith; @ExtendWith(WeldJunit5Extension.class) diff --git a/junit5/src/test/java/org/jboss/weld/junit5/interceptor/MockInterceptorTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/interceptor/MockInterceptorTest.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/interceptor/MockInterceptorTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/interceptor/MockInterceptorTest.java index b5437e9d..f1129479 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/interceptor/MockInterceptorTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/interceptor/MockInterceptorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.interceptor; +package org.jboss.weld.junit.jupiter.interceptor; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; @@ -34,9 +34,9 @@ import jakarta.interceptor.InterceptorBinding; import org.jboss.weld.junit.MockInterceptor; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/nested/MyBean.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/nested/MyBean.java similarity index 79% rename from junit5/src/test/java/org/jboss/weld/junit5/nested/MyBean.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/nested/MyBean.java index 3772e293..85031c98 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/nested/MyBean.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/nested/MyBean.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.nested; +package org.jboss.weld.junit.jupiter.nested; import jakarta.enterprise.context.ApplicationScoped; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/nested/NestedTestClassTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/nested/NestedTestClassTest.java similarity index 87% rename from junit5/src/test/java/org/jboss/weld/junit5/nested/NestedTestClassTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/nested/NestedTestClassTest.java index 709133d7..77170c39 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/nested/NestedTestClassTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/nested/NestedTestClassTest.java @@ -1,10 +1,10 @@ -package org.jboss.weld.junit5.nested; +package org.jboss.weld.junit.jupiter.nested; import jakarta.inject.Inject; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/ofpackage/Alpha.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/ofpackage/Alpha.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/ofpackage/Alpha.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/ofpackage/Alpha.java index 44ec4c86..d14d1df7 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/ofpackage/Alpha.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/ofpackage/Alpha.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.ofpackage; +package org.jboss.weld.junit.jupiter.ofpackage; import jakarta.annotation.PostConstruct; import jakarta.enterprise.context.Dependent; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/ofpackage/Bravo.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/ofpackage/Bravo.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/ofpackage/Bravo.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/ofpackage/Bravo.java index ba59e722..4d8212b6 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/ofpackage/Bravo.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/ofpackage/Bravo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.ofpackage; +package org.jboss.weld.junit.jupiter.ofpackage; import jakarta.annotation.PostConstruct; import jakarta.enterprise.context.Dependent; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/ofpackage/OfPackageTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/ofpackage/OfPackageTest.java similarity index 84% rename from junit5/src/test/java/org/jboss/weld/junit5/ofpackage/OfPackageTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/ofpackage/OfPackageTest.java index 33bb2b1d..3598e9b6 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/ofpackage/OfPackageTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/ofpackage/OfPackageTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.ofpackage; +package org.jboss.weld.junit.jupiter.ofpackage; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; -import org.jboss.weld.junit5.basic.Foo; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; +import org.jboss.weld.junit.jupiter.basic.Foo; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/resources/DummySessionBean.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/DummySessionBean.java similarity index 72% rename from junit5/src/test/java/org/jboss/weld/junit5/resources/DummySessionBean.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/DummySessionBean.java index ea21a127..243fbd89 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/resources/DummySessionBean.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/DummySessionBean.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.resources; +package org.jboss.weld.junit.jupiter.resources; public class DummySessionBean { diff --git a/junit5/src/test/java/org/jboss/weld/junit5/resources/FooEjbs.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/FooEjbs.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/resources/FooEjbs.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/FooEjbs.java index 42d500cd..131ef7e3 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/resources/FooEjbs.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/FooEjbs.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.resources; +package org.jboss.weld.junit.jupiter.resources; import jakarta.ejb.EJB; import jakarta.enterprise.context.Dependent; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/resources/FooJpa.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/FooJpa.java similarity index 96% rename from junit5/src/test/java/org/jboss/weld/junit5/resources/FooJpa.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/FooJpa.java index 55fd6f84..0cde78d8 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/resources/FooJpa.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/FooJpa.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.resources; +package org.jboss.weld.junit.jupiter.resources; import jakarta.enterprise.context.Dependent; import jakarta.persistence.EntityManager; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/resources/FooResources.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/FooResources.java similarity index 95% rename from junit5/src/test/java/org/jboss/weld/junit5/resources/FooResources.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/FooResources.java index 07c48914..13f1bfeb 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/resources/FooResources.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/FooResources.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.resources; +package org.jboss.weld.junit.jupiter.resources; import jakarta.annotation.Resource; import jakarta.enterprise.context.Dependent; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/resources/InjectResourcesTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/InjectResourcesTest.java similarity index 98% rename from junit5/src/test/java/org/jboss/weld/junit5/resources/InjectResourcesTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/InjectResourcesTest.java index 9e798dfe..59942c7e 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/resources/InjectResourcesTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/InjectResourcesTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.resources; +package org.jboss.weld.junit.jupiter.resources; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -43,9 +43,9 @@ import jakarta.persistence.criteria.CriteriaUpdate; import jakarta.persistence.metamodel.Metamodel; -import org.jboss.weld.junit5.EnableWeld; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.EnableWeld; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Test; /** diff --git a/junit5/src/test/java/org/jboss/weld/junit5/testLifecycle/PerClassLifecycleChildTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/testLifecycle/PerClassLifecycleChildTest.java similarity index 89% rename from junit5/src/test/java/org/jboss/weld/junit5/testLifecycle/PerClassLifecycleChildTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/testLifecycle/PerClassLifecycleChildTest.java index 3a203599..0398fd49 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/testLifecycle/PerClassLifecycleChildTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/testLifecycle/PerClassLifecycleChildTest.java @@ -1,4 +1,4 @@ -package org.jboss.weld.junit5.testLifecycle; +package org.jboss.weld.junit.jupiter.testLifecycle; // all configuration is inherited, so are test methods // we should recognize this class as having per-class lifecycle and bootstrap Weld accordingly diff --git a/junit5/src/test/java/org/jboss/weld/junit5/testLifecycle/PerClassLifecycleTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/testLifecycle/PerClassLifecycleTest.java similarity index 91% rename from junit5/src/test/java/org/jboss/weld/junit5/testLifecycle/PerClassLifecycleTest.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/testLifecycle/PerClassLifecycleTest.java index ef159866..8375cf7a 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/testLifecycle/PerClassLifecycleTest.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/testLifecycle/PerClassLifecycleTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.testLifecycle; +package org.jboss.weld.junit.jupiter.testLifecycle; import org.jboss.weld.environment.se.Weld; import org.jboss.weld.environment.se.WeldContainer; -import org.jboss.weld.junit5.WeldInitiator; -import org.jboss.weld.junit5.WeldJunit5Extension; -import org.jboss.weld.junit5.WeldSetup; +import org.jboss.weld.junit.jupiter.WeldInitiator; +import org.jboss.weld.junit.jupiter.WeldJunit5Extension; +import org.jboss.weld.junit.jupiter.WeldSetup; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; diff --git a/junit5/src/test/java/org/jboss/weld/junit5/testLifecycle/PlainBean.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/testLifecycle/PlainBean.java similarity index 94% rename from junit5/src/test/java/org/jboss/weld/junit5/testLifecycle/PlainBean.java rename to junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/testLifecycle/PlainBean.java index 73b0de02..c581073d 100644 --- a/junit5/src/test/java/org/jboss/weld/junit5/testLifecycle/PlainBean.java +++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/testLifecycle/PlainBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.junit5.testLifecycle; +package org.jboss.weld.junit.jupiter.testLifecycle; import jakarta.enterprise.context.ApplicationScoped; diff --git a/junit-jupiter/src/test/resources/META-INF/services/org.jboss.weld.junit.jupiter.WeldJunitEnricher b/junit-jupiter/src/test/resources/META-INF/services/org.jboss.weld.junit.jupiter.WeldJunitEnricher new file mode 100644 index 00000000..544df184 --- /dev/null +++ b/junit-jupiter/src/test/resources/META-INF/services/org.jboss.weld.junit.jupiter.WeldJunitEnricher @@ -0,0 +1 @@ +org.jboss.weld.junit.jupiter.enricher.FooWeldJunitEnricher diff --git a/junit5/src/test/resources/junit-platform.properties b/junit-jupiter/src/test/resources/junit-platform.properties similarity index 100% rename from junit5/src/test/resources/junit-platform.properties rename to junit-jupiter/src/test/resources/junit-platform.properties diff --git a/junit5/src/test/resources/logging.properties b/junit-jupiter/src/test/resources/logging.properties similarity index 100% rename from junit5/src/test/resources/logging.properties rename to junit-jupiter/src/test/resources/logging.properties diff --git a/junit4/pom.xml b/junit4/pom.xml index 78ec409b..d893c076 100644 --- a/junit4/pom.xml +++ b/junit4/pom.xml @@ -6,7 +6,7 @@ org.jboss.weld weld-junit-parent - 5.0.4-SNAPSHOT + 6.0.0-SNAPSHOT weld-junit4 diff --git a/junit5/src/test/java/org/jboss/weld/junit5/initiator/bean/Bar.java b/junit5/src/test/java/org/jboss/weld/junit5/initiator/bean/Bar.java deleted file mode 100644 index f421cab0..00000000 --- a/junit5/src/test/java/org/jboss/weld/junit5/initiator/bean/Bar.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.jboss.weld.junit5.initiator.bean; - -public class Bar { -} diff --git a/junit5/src/test/java/org/jboss/weld/junit5/initiator/bean/Foo.java b/junit5/src/test/java/org/jboss/weld/junit5/initiator/bean/Foo.java deleted file mode 100644 index 776b237a..00000000 --- a/junit5/src/test/java/org/jboss/weld/junit5/initiator/bean/Foo.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jboss.weld.junit5.initiator.bean; - -public class Foo { - -} diff --git a/junit5/src/test/resources/META-INF/services/org.jboss.weld.junit5.WeldJunitEnricher b/junit5/src/test/resources/META-INF/services/org.jboss.weld.junit5.WeldJunitEnricher deleted file mode 100644 index ddfc08a1..00000000 --- a/junit5/src/test/resources/META-INF/services/org.jboss.weld.junit5.WeldJunitEnricher +++ /dev/null @@ -1 +0,0 @@ -org.jboss.weld.junit5.enricher.FooWeldJunitEnricher \ No newline at end of file diff --git a/pom.xml b/pom.xml index ebb28b6c..b9fdb163 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 weld-junit-parent pom - 5.0.4-SNAPSHOT + 6.0.0-SNAPSHOT Weld Extensions for JUnit and Spock Set of JUnit/Spock extensions to enhance the testing of CDI components. @@ -49,14 +49,13 @@ 4.13.2 - - 2.4-M6-groovy-4.0 - 3.0.25 - 6.0.4.Final + 6.0.3 + 2.4-groovy-4.0 + 4.0.30 + 7.0.0.Alpha1 5.22.0 4.0.1 2.0.1 - 4.0.1 3.1.0 2.25.3 @@ -68,7 +67,7 @@ junit4 - junit5 + junit-jupiter spock junit-common @@ -114,7 +113,7 @@ - org.codehaus.groovy + org.apache.groovy groovy ${version.groovy} @@ -170,30 +169,6 @@ - - - junit5 - - - !junit6 - - - - 5.13.4 - - - - - junit6 - - - junit6 - - - - 6.0.3 - - spotbugs diff --git a/spock/pom.xml b/spock/pom.xml index b3c965e4..1c0389fa 100644 --- a/spock/pom.xml +++ b/spock/pom.xml @@ -7,7 +7,7 @@ org.jboss.weld weld-junit-parent - 5.0.4-SNAPSHOT + 6.0.0-SNAPSHOT weld-spock @@ -42,7 +42,7 @@ - org.codehaus.groovy + org.apache.groovy groovy test