Fix compileOnly dependencies

Signed-off-by: Kyle Aure <[email protected]>

core/jakarta/build.gradle

@@ -52,16 +52,13 @@ jar.dependsOn transform
 
 //Overwrites the empty jar with the transformed jar in the build/libs directory
 task overwrite(type: Copy) {
-    dependsOn jar
     from(transformed_jar)
     into('build/libs')
 }
 
-assemble.dependsOn overwrite
+jar.finalizedBy overwrite
 
 apply from: publishScript
 
-publishToMavenLocal.dependsOn overwrite
-
 publishToMavenLocal.dependsOn ':microshed-testing-core:publishToMavenLocal'
 

modules/liberty/build.gradle

@@ -3,6 +3,7 @@ description = "Extensions for using MicroShed Testing with Liberty servers"
 
 dependencies {
   compile project(':microshed-testing-testcontainers')
+  compileOnly project(':microshed-testing-core')
 }
 
 apply from: publishScript

modules/payara-micro/build.gradle

@@ -3,6 +3,7 @@ description = "Extensions for using MicroShed Testing with Payara Micro servers"
 
 dependencies {
   compile project(':microshed-testing-testcontainers')
+  compileOnly project(':microshed-testing-core')
 }
 
 apply from: publishScript

modules/payara-server/build.gradle

@@ -3,6 +3,7 @@ description = "Extensions for using MicroShed Testing with Payara servers"
 
 dependencies {
   compile project(':microshed-testing-testcontainers')
+  compileOnly project(':microshed-testing-core')
 }
 
 apply from: publishScript

modules/quarkus/build.gradle

@@ -3,6 +3,7 @@ description = "Extensions for using MicroShed Testing with Quarkus"
 
 dependencies {
   compile project(':microshed-testing-testcontainers')
+  compileOnly project(':microshed-testing-core')
   compileOnly 'io.quarkus:quarkus-junit5:1.8.3.Final'
 }
 

modules/testcontainers/build.gradle

@@ -15,8 +15,8 @@ sourceSets {
 }
 
 dependencies {
-  compile project(':microshed-testing-core')
   compile 'org.testcontainers:junit-jupiter:1.19.1'
+  compileOnly project(':microshed-testing-core')
   testCompile 'org.eclipse.microprofile.rest.client:microprofile-rest-client-api:1.4.1'
   testCompile 'org.slf4j:slf4j-log4j12:1.7.36'
   testCompile 'org.testcontainers:mockserver:1.19.1'

modules/wildfly/build.gradle

@@ -3,6 +3,7 @@ description = "Extensions for using MicroShed Testing with WildFly servers"
 
 dependencies {
   compile project(':microshed-testing-testcontainers')
+  compileOnly project(':microshed-testing-core')
 }
 
 apply from: publishScript

sample-apps/everything-app/build.gradle

@@ -7,6 +7,7 @@ dependencies {
   providedCompile 'org.eclipse.microprofile:microprofile:2.1'
   compile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.11.2'
   testCompile project(':microshed-testing-testcontainers')
+  testCompile project(':microshed-testing-core')
   testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.36'
   testCompile 'org.testcontainers:mockserver:1.19.1'
   testCompile 'org.mock-server:mockserver-client-java:5.5.4'

sample-apps/everything-jakarta-app/build.gradle

@@ -11,6 +11,7 @@ dependencies {
   compile 'org.mongodb:mongo-java-driver:3.11.2'
 
   testCompile project(':microshed-testing-testcontainers')
+  testCompile project(':microshed-testing-core-jakarta')
 
   testCompile 'org.slf4j:slf4j-log4j12:1.7.36'
   testCompile 'org.testcontainers:mockserver:1.19.1'

sample-apps/jaxrs-basicauth/build.gradle

@@ -6,6 +6,7 @@ dependencies {
   providedCompile 'javax:javaee-api:8.0.1'
   providedCompile 'org.eclipse.microprofile:microprofile:2.1'
   testCompile project(':microshed-testing-testcontainers')
+  testCompile project(':microshed-testing-core')
   testCompile group: 'org.assertj', name: 'assertj-core', version: '3.15.0'
   testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.36'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'

sample-apps/jaxrs-json/build.gradle

@@ -6,6 +6,7 @@ dependencies {
   providedCompile 'javax:javaee-api:8.0.1'
   providedCompile 'org.eclipse.microprofile:microprofile:2.1'
   testCompile project(':microshed-testing-testcontainers')
+  testCompile project(':microshed-testing-core')
   testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.36'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }

sample-apps/jaxrs-mpjwt/build.gradle

@@ -6,6 +6,7 @@ dependencies {
   providedCompile 'javax:javaee-api:8.0.1'
   providedCompile 'org.eclipse.microprofile:microprofile:2.1'
   testCompile project(':microshed-testing-testcontainers')
+  testCompile project(':microshed-testing-core')
   testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.36'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }

sample-apps/jdbc-app/build.gradle

@@ -12,6 +12,7 @@ dependencies {
   testCompile 'org.testcontainers:postgresql:1.15.0'
   testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.36'
   testCompile project(':microshed-testing-testcontainers')
+  testCompile project(':microshed-testing-core')
   testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
   postgres 'org.postgresql:postgresql:42.2.8'
 }

sample-apps/kafka-app/build.gradle

@@ -8,6 +8,7 @@ dependencies {
   providedCompile 'org.eclipse.microprofile.reactive.messaging:microprofile-reactive-messaging-api:1.0'
   compile 'org.apache.kafka:kafka-clients:2.4.0'
   testCompile project(':microshed-testing-testcontainers')
+  testCompile project(':microshed-testing-core')
   testCompile 'org.awaitility:awaitility:4.0.2'
   testCompile 'org.testcontainers:kafka:1.15.0'
   testCompile 'org.slf4j:slf4j-log4j12:1.7.36'

sample-apps/liberty-app/build.gradle

@@ -6,6 +6,7 @@ dependencies {
   providedCompile 'javax:javaee-api:8.0.1'
   providedCompile 'org.eclipse.microprofile:microprofile:3.0'
   testCompile project(':microshed-testing-liberty')
+  testCompile project(':microshed-testing-core')
   testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.36'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }

sample-apps/maven-app/build.gradle

@@ -34,6 +34,7 @@ task deleteTarget(type: Delete) {
 }
 
 compileJava.dependsOn ':microshed-testing-testcontainers:publishToMavenLocal'
+compileJava.dependsOn ':microshed-testing-core:publishToMavenLocal'
 assemble.dependsOn runMvnCompile
 test.dependsOn runMvnVerify
 clean.dependsOn deleteTarget

sample-apps/maven-app/pom.xml

@@ -37,6 +37,12 @@
 			<version>0.9.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.microshed</groupId>
+			<artifactId>microshed-testing-core</artifactId>
+			<version>0.9.2-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>

sample-apps/payara-app/build.gradle

@@ -6,6 +6,7 @@ dependencies {
   providedCompile 'javax:javaee-api:8.0.1'
   providedCompile 'org.eclipse.microprofile:microprofile:2.1'
   testCompile project(':microshed-testing-payara-server')
+  testCompile project(':microshed-testing-core')
   testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.36'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }

sample-apps/quarkus-app/pom.xml

@@ -85,6 +85,12 @@
       <version>0.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.microshed</groupId>
+      <artifactId>microshed-testing-core</artifactId>
+      <version>0.9.2-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>postgresql</artifactId>

sample-apps/wildfly-app/build.gradle

@@ -6,6 +6,7 @@ dependencies {
   providedCompile 'javax:javaee-api:8.0.1'
   providedCompile 'org.eclipse.microprofile:microprofile:2.1'
   testCompile project(':microshed-testing-wildfly')
+  testCompile project(':microshed-testing-core')
   testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.36'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }