diff --git a/extension/api/pom.xml b/extension/api/pom.xml index 24b839c..b26548c 100644 --- a/extension/api/pom.xml +++ b/extension/api/pom.xml @@ -20,11 +20,6 @@ spiap-api - - io.toolisticon.spiap - spiap-processor - - @@ -32,6 +27,25 @@ + + maven-compiler-plugin + + + + io.toolisticon.spiap + spiap-processor + ${spiap.version} + + + io.toolisticon.spiap + spiap-api + ${spiap.version} + + + + + + maven-enforcer-plugin diff --git a/extension/junit4/pom.xml b/extension/junit4/pom.xml index a3c1400..020e9e4 100644 --- a/extension/junit4/pom.xml +++ b/extension/junit4/pom.xml @@ -44,7 +44,23 @@ - + + maven-compiler-plugin + + + + io.toolisticon.spiap + spiap-processor + ${spiap.version} + + + io.toolisticon.spiap + spiap-api + ${spiap.version} + + + + maven-enforcer-plugin diff --git a/extension/junit4/src/test/java/io/toolisticon/cute/extension/plainjava/JUnit4AssertionTest.java b/extension/junit4/src/test/java/io/toolisticon/cute/extension/junit4/JUnit4AssertionTest.java similarity index 89% rename from extension/junit4/src/test/java/io/toolisticon/cute/extension/plainjava/JUnit4AssertionTest.java rename to extension/junit4/src/test/java/io/toolisticon/cute/extension/junit4/JUnit4AssertionTest.java index c699a3c..34a819b 100644 --- a/extension/junit4/src/test/java/io/toolisticon/cute/extension/plainjava/JUnit4AssertionTest.java +++ b/extension/junit4/src/test/java/io/toolisticon/cute/extension/junit4/JUnit4AssertionTest.java @@ -1,13 +1,13 @@ -package io.toolisticon.cute.extension.plainjava; +package io.toolisticon.cute.extension.junit4; -import io.toolisticon.cute.extension.api.AssertionSpi; -import io.toolisticon.cute.extension.api.AssertionSpiServiceLocator; -import io.toolisticon.cute.extension.junit4.JUnit4Assertion; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Test; +import io.toolisticon.cute.extension.api.AssertionSpi; +import io.toolisticon.cute.extension.api.AssertionSpiServiceLocator; + /** * Unit test for {@link JUnit4Assertion}. */ diff --git a/extension/junit5/pom.xml b/extension/junit5/pom.xml index 11c77f5..6c0fce6 100644 --- a/extension/junit5/pom.xml +++ b/extension/junit5/pom.xml @@ -49,9 +49,15 @@ spiap-processor ${spiap.version} + + io.toolisticon.spiap + spiap-api + ${spiap.version} + + maven-enforcer-plugin diff --git a/extension/junit5/src/test/java/io/toolisticon/cute/extension/junit5/JUnit5AssertionTest.java b/extension/junit5/src/test/java/io/toolisticon/cute/extension/junit5/JUnit5AssertionTest.java index 4bdac37..2f7d77d 100644 --- a/extension/junit5/src/test/java/io/toolisticon/cute/extension/junit5/JUnit5AssertionTest.java +++ b/extension/junit5/src/test/java/io/toolisticon/cute/extension/junit5/JUnit5AssertionTest.java @@ -2,6 +2,7 @@ import io.toolisticon.cute.extension.api.AssertionSpi; import io.toolisticon.cute.extension.api.AssertionSpiServiceLocator; + import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; diff --git a/extension/plainjava/src/main/java/io/toolisticon/cute/extension/plainjava/package-info.java b/extension/plainjava/src/main/java/io/toolisticon/cute/extension/plainjava/package-info.java deleted file mode 100644 index b57b4a6..0000000 --- a/extension/plainjava/src/main/java/io/toolisticon/cute/extension/plainjava/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package contains all public classes and interfaces intentioned to be used as part of the public api. - */ -@io.toolisticon.spiap.api.SpiServiceLocator(io.toolisticon.cute.extension.api.AssertionSpi.class) -package io.toolisticon.cute.extension.plainjava; \ No newline at end of file diff --git a/extension/plainjava/src/test/java/io/toolisticon/cute/extension/plainjava/AssertionErrorAssertionTest.java b/extension/plainjava/src/test/java/io/toolisticon/cute/extension/plainjava/AssertionErrorAssertionTest.java index aad3231..e9d2529 100644 --- a/extension/plainjava/src/test/java/io/toolisticon/cute/extension/plainjava/AssertionErrorAssertionTest.java +++ b/extension/plainjava/src/test/java/io/toolisticon/cute/extension/plainjava/AssertionErrorAssertionTest.java @@ -1,6 +1,8 @@ package io.toolisticon.cute.extension.plainjava; import io.toolisticon.cute.extension.api.AssertionSpi; +import io.toolisticon.cute.extension.api.AssertionSpiServiceLocator; + import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Assert; diff --git a/extension/testng/pom.xml b/extension/testng/pom.xml index 5690edc..4aabd1e 100644 --- a/extension/testng/pom.xml +++ b/extension/testng/pom.xml @@ -48,6 +48,11 @@ spiap-processor ${spiap.version} + + io.toolisticon.spiap + spiap-api + ${spiap.version} + diff --git a/extension/testng/src/test/java/io/toolisticon/cute/extension/testng/TestNGAssertionTest.java b/extension/testng/src/test/java/io/toolisticon/cute/extension/testng/TestNGAssertionTest.java index f439872..7eb2cd2 100644 --- a/extension/testng/src/test/java/io/toolisticon/cute/extension/testng/TestNGAssertionTest.java +++ b/extension/testng/src/test/java/io/toolisticon/cute/extension/testng/TestNGAssertionTest.java @@ -2,6 +2,7 @@ import io.toolisticon.cute.extension.api.AssertionSpi; import io.toolisticon.cute.extension.api.AssertionSpiServiceLocator; + import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.testng.Assert;