Merge pull request MicroShed#415 from KyleAure/jakarta-core-transitiv…

…e-dependency Fix transitive dependencies within the Microshed project
appiepollo14 · Dec 28, 2023 · 380f08f · 380f08f
2 parents 5d720dc + 289a44a
commit 380f08f
Show file tree

Hide file tree

Showing 19 changed files with 1 addition and 39 deletions.
diff --git a/modules/liberty/build.gradle b/modules/liberty/build.gradle
@@ -3,8 +3,6 @@ description = "Extensions for using MicroShed Testing with Liberty servers"
 
 dependencies {
   api project(':microshed-testing-testcontainers')
-
-  compileOnly project(':microshed-testing-core')
 }
 
 apply from: publishScript

diff --git a/modules/payara-micro/build.gradle b/modules/payara-micro/build.gradle
@@ -3,8 +3,6 @@ description = "Extensions for using MicroShed Testing with Payara Micro servers"
 
 dependencies {
   api project(':microshed-testing-testcontainers')
-
-  compileOnly project(':microshed-testing-core')
 }
 
 apply from: publishScript

diff --git a/modules/payara-server/build.gradle b/modules/payara-server/build.gradle
@@ -3,8 +3,6 @@ description = "Extensions for using MicroShed Testing with Payara servers"
 
 dependencies {
   api project(':microshed-testing-testcontainers')
-
-  compileOnly project(':microshed-testing-core')
 }
 
 apply from: publishScript

diff --git a/modules/quarkus/build.gradle b/modules/quarkus/build.gradle
@@ -4,8 +4,6 @@ description = "Extensions for using MicroShed Testing with Quarkus"
 dependencies {
   api 'io.quarkus:quarkus-junit5:3.6.4'
   api project(':microshed-testing-testcontainers')
-
-  compileOnly project(':microshed-testing-core')
 }
 
 apply from: publishScript

diff --git a/modules/testcontainers/build.gradle b/modules/testcontainers/build.gradle
@@ -16,12 +16,9 @@ sourceSets {
 dependencies {
   api 'org.junit.jupiter:junit-jupiter-api:5.10.1'
   api 'org.testcontainers:junit-jupiter:1.19.3'
-
-  compileOnly project(':microshed-testing-core')
+  api project(':microshed-testing-core')
 
   //Unit + Integration testing
-  testImplementation project(':microshed-testing-core')
-
   testImplementation 'org.eclipse.microprofile.rest.client:microprofile-rest-client-api:3.0.1'
 
   testImplementation 'org.slf4j:slf4j-log4j12:2.0.9'

diff --git a/modules/wildfly/build.gradle b/modules/wildfly/build.gradle
@@ -3,8 +3,6 @@ description = "Extensions for using MicroShed Testing with WildFly servers"
 
 dependencies {
   api project(':microshed-testing-testcontainers')
-
-  compileOnly project(':microshed-testing-core')
 }
 
 apply from: publishScript

diff --git a/sample-apps/everything-app/build.gradle b/sample-apps/everything-app/build.gradle
@@ -9,7 +9,6 @@ dependencies {
   implementation 'org.mongodb:mongo-java-driver:3.12.14'
 
   testImplementation project(':microshed-testing-testcontainers')
-  testImplementation project(':microshed-testing-core')
 
   testImplementation 'org.slf4j:slf4j-log4j12:2.0.9'
   testImplementation 'org.testcontainers:mockserver:1.19.3'

diff --git a/sample-apps/jaxrs-basicauth/build.gradle b/sample-apps/jaxrs-basicauth/build.gradle
@@ -7,7 +7,6 @@ dependencies {
   api 'org.eclipse.microprofile:microprofile:6.1'
 
   testImplementation project(':microshed-testing-testcontainers')
-  testImplementation project(':microshed-testing-core')
 
   testImplementation 'org.assertj:assertj-core:3.24.2'
   testImplementation 'org.slf4j:slf4j-log4j12:2.0.9'

diff --git a/sample-apps/jaxrs-json/build.gradle b/sample-apps/jaxrs-json/build.gradle
@@ -7,7 +7,6 @@ dependencies {
   api 'org.eclipse.microprofile:microprofile:6.1'
 
   testImplementation project(':microshed-testing-testcontainers')
-  testImplementation project(':microshed-testing-core')
 
   testImplementation 'org.slf4j:slf4j-log4j12:2.0.9'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'

diff --git a/sample-apps/jaxrs-mpjwt/build.gradle b/sample-apps/jaxrs-mpjwt/build.gradle
@@ -7,7 +7,6 @@ dependencies {
   api 'org.eclipse.microprofile:microprofile:6.1'
 
   testImplementation project(':microshed-testing-testcontainers')
-  testImplementation project(':microshed-testing-core')
 
   testImplementation 'org.slf4j:slf4j-log4j12:2.0.9'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'

diff --git a/sample-apps/jdbc-app/build.gradle b/sample-apps/jdbc-app/build.gradle
@@ -15,7 +15,6 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 
     testImplementation project(':microshed-testing-testcontainers')
-    testImplementation project(':microshed-testing-core')
 
     postgres 'org.postgresql:postgresql:42.7.1'
 }

diff --git a/sample-apps/kafka-app/build.gradle b/sample-apps/kafka-app/build.gradle
@@ -10,7 +10,6 @@ dependencies {
   implementation 'org.apache.kafka:kafka-clients:3.6.1'
 
   testImplementation project(':microshed-testing-testcontainers')
-  testImplementation project(':microshed-testing-core')
 
   testImplementation 'org.awaitility:awaitility:4.2.0'
   testImplementation 'org.testcontainers:kafka:1.19.3'

diff --git a/sample-apps/liberty-app/build.gradle b/sample-apps/liberty-app/build.gradle
@@ -7,7 +7,6 @@ dependencies {
   api 'org.eclipse.microprofile:microprofile:6.1'
 
   testImplementation project(':microshed-testing-liberty')
-  testImplementation project(':microshed-testing-core')
 
   testImplementation 'org.slf4j:slf4j-log4j12:2.0.9'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'

diff --git a/sample-apps/maven-app/build.gradle b/sample-apps/maven-app/build.gradle
@@ -34,7 +34,6 @@ 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

diff --git a/sample-apps/maven-app/pom.xml b/sample-apps/maven-app/pom.xml
@@ -30,19 +30,12 @@
 			<version>10.0.0</version>
 			<scope>provided</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.microshed</groupId>
 			<artifactId>microshed-testing-testcontainers</artifactId>
 			<version>0.9.3-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.microshed</groupId>
-			<artifactId>microshed-testing-core</artifactId>
-			<version>0.9.3-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
@@ -86,4 +79,3 @@
 		</plugins>
 	</build>
 </project>
-
diff --git a/sample-apps/payara-app/build.gradle b/sample-apps/payara-app/build.gradle
@@ -7,7 +7,6 @@ dependencies {
   api 'org.eclipse.microprofile:microprofile:6.1'
 
   testImplementation project(':microshed-testing-payara-server')
-  testImplementation project(':microshed-testing-core')
 
   testImplementation 'org.slf4j:slf4j-log4j12:2.0.9'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'

diff --git a/sample-apps/quarkus-app/build.gradle b/sample-apps/quarkus-app/build.gradle
@@ -38,7 +38,6 @@ task deleteTarget(type: Delete) {
 }
 
 compileJava.dependsOn ':microshed-testing-quarkus:publishToMavenLocal'
-compileJava.dependsOn ':microshed-testing-core:publishToMavenLocal'
 assemble.dependsOn runMvnCompile
 test.dependsOn runMvnVerify
 clean.dependsOn deleteTarget

diff --git a/sample-apps/quarkus-app/pom.xml b/sample-apps/quarkus-app/pom.xml
@@ -90,12 +90,6 @@
       <version>0.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.microshed</groupId>
-      <artifactId>microshed-testing-core</artifactId>
-      <version>0.9.3-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>postgresql</artifactId>

diff --git a/sample-apps/wildfly-app/build.gradle b/sample-apps/wildfly-app/build.gradle
@@ -7,7 +7,6 @@ dependencies {
   api 'org.eclipse.microprofile:microprofile:6.1'
 
   testImplementation project(':microshed-testing-wildfly')
-  testImplementation project(':microshed-testing-core')
 
   testImplementation 'org.slf4j:slf4j-log4j12:2.0.9'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'