Use M4

micronaut-projects · Jul 20, 2021 · f7cbbcd · f7cbbcd
1 parent 08ed079
commit f7cbbcd
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,10 +18,6 @@ subprojects { Project subproject ->
     if (subproject.name != 'test-bom') {
         apply plugin: "io.micronaut.build.internal.common"
 
-        repositories {
-            maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
-        }
-
         micronautBuild {
             resolutionStrategy {
                 eachDependency { DependencyResolveDetails details ->

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 projectVersion=3.0.0-SNAPSHOT
 micronautDocsVersion=2.0.0.RC1
-micronautVersion=3.0.0-M3
+micronautVersion=3.0.0-M4
 
 spockVersion=2.0-groovy-3.0
 groovyVersion=3.0.8

diff --git a/test-core/build.gradle b/test-core/build.gradle
@@ -10,11 +10,10 @@ dependencies {
     )
 
     api "io.micronaut:micronaut-inject:$micronautVersion"
-    compileOnly "jakarta.inject:jakarta.inject-api:2.0.0"
 
-    testCompileOnly "jakarta.inject:jakarta.inject-api:2.0.0"
     implementation "io.micronaut:micronaut-runtime:$micronautVersion"
 }
+
 jar {
     exclude "io/micronaut/test/extensions/spock/*"
     exclude "io/micronaut/test/extensions/junit5/*"

diff --git a/test-core/src/main/java/io/micronaut/test/condition/TestActiveCondition.java b/test-core/src/main/java/io/micronaut/test/condition/TestActiveCondition.java
@@ -34,11 +34,6 @@
 public class TestActiveCondition implements Condition {
 
     public static final String ACTIVE_MOCKS = "micronaut.test.spock.active.mocks";
-    /**
-     * Deprecated please use {@link #ACTIVE_SPEC_CLAZZ} instead.
-     */
-    @Deprecated
-    public static final String ACTIVE_SPEC_NAME = "micronaut.test.active.spec";
 
     public static final String ACTIVE_SPEC_CLAZZ = "micronaut.test.active.spec.clazz";
 

diff --git a/test-core/src/main/java/io/micronaut/test/extensions/AbstractMicronautExtension.java b/test-core/src/main/java/io/micronaut/test/extensions/AbstractMicronautExtension.java
@@ -213,7 +213,7 @@ protected void beforeClass(C context, Class<?> testClass, @Nullable MicronautTes
             if (TestPropertyProvider.class.isAssignableFrom(testClass)) {
                 resolveTestProperties(context, testAnnotationValue, testProperties);
             }
-            testProperties.put(TestActiveCondition.ACTIVE_SPEC_NAME, aPackage.getName() + "." + testClass.getSimpleName());
+
             testProperties.put(TestActiveCondition.ACTIVE_SPEC_CLAZZ, testClass);
             testProperties.put(TEST_ROLLBACK, String.valueOf(testAnnotationValue.rollback()));
             testProperties.put(TEST_TRANSACTIONAL, String.valueOf(testAnnotationValue.transactional()));

diff --git a/test-junit5/build.gradle b/test-junit5/build.gradle
@@ -6,9 +6,7 @@ dependencies {
     api(
             "org.junit.jupiter:junit-jupiter-api:$junitVersion"
     )
-    compileOnly "jakarta.inject:jakarta.inject-api:2.0.0"
 
-    testCompileOnly "jakarta.inject:jakarta.inject-api:2.0.0"
     testCompileOnly "io.micronaut:micronaut-inject:$micronautVersion"
     testRuntimeOnly(
             "org.junit.jupiter:junit-jupiter-engine:$junitVersion"