diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95da006..38cd0b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,8 +14,6 @@ jobs: fail-fast: false matrix: include: - - title: "JDK 8" - java: 8 - title: "JDK 11" java: 11 - title: "JDK 16" @@ -25,7 +23,7 @@ jobs: - name: 'Checkout from Git' uses: actions/checkout@v3 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: adopt diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4420788..58c51c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,11 +26,11 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-maven- - name: Setup Java JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 8 distribution: adopt - server-id: ossrh + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Configure Git user diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 4fcad59..5affda1 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -16,11 +16,11 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-maven- - name: Setup Java JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 8 distribution: adopt - server-id: ossrh + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Publish JARs diff --git a/pom.xml b/pom.xml index 6e8371a..4246783 100755 --- a/pom.xml +++ b/pom.xml @@ -67,14 +67,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://oss.sonatype.org/ - true + central + true @@ -296,12 +295,8 @@ - ossrh - https://oss.sonatype.org/content/repositories/snapshots + central + https://central.sonatype.com/repository/maven-snapshots/ - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - diff --git a/src/main/java/org/pitest/junit5/JUnit5TestUnitFinder.java b/src/main/java/org/pitest/junit5/JUnit5TestUnitFinder.java index a5ef6f1..4d237c4 100755 --- a/src/main/java/org/pitest/junit5/JUnit5TestUnitFinder.java +++ b/src/main/java/org/pitest/junit5/JUnit5TestUnitFinder.java @@ -25,6 +25,7 @@ import static java.util.stream.Collectors.toList; import org.junit.platform.commons.PreconditionViolationException; +import org.junit.platform.engine.DiscoverySelector; import org.junit.platform.engine.Filter; import org.junit.platform.engine.TestExecutionResult; import org.junit.platform.engine.discovery.DiscoverySelectors; @@ -82,9 +83,14 @@ public List findTestUnits(Class clazz, TestUnitExecutionListener ex TestIdentifierListener listener = new TestIdentifierListener(clazz, executionListener); + // Although we have a class instance to examine, some junit 5 extensions (well Quarkus, but maybe also others) + // switch the classloader during discover. Must therefore drop back to a name string so classloading + // matches normal execution. + DiscoverySelector selector = DiscoverySelectors.selectClass(clazz.getName()); + launcher.execute(LauncherDiscoveryRequestBuilder .request() - .selectors(DiscoverySelectors.selectClass(clazz)) + .selectors(selector) .filters(filters.toArray(new Filter[filters.size()])) .build(), listener);