Merge pull request #228 from aguibert/tc-1.15.0-rc2

Upgrade to Testcontainers 1.15.0-rc2

Author: aguibert

modules/testcontainers/build.gradle

@@ -16,10 +16,10 @@ sourceSets {
 
 dependencies {
   compile project(':microshed-testing-core')
-  compile 'org.testcontainers:junit-jupiter:1.14.3'
+  compile 'org.testcontainers:junit-jupiter:1.15.0-rc2'
   testCompile 'org.eclipse.microprofile.rest.client:microprofile-rest-client-api:1.4.1'
   testCompile 'org.slf4j:slf4j-log4j12:1.7.30'
-  testCompile 'org.testcontainers:mockserver:1.14.3'
+  testCompile 'org.testcontainers:mockserver:1.15.0-rc2'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.7.0'
 }
 

sample-apps/everything-app/build.gradle

@@ -8,7 +8,7 @@ dependencies {
   compile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.11.2'
   testCompile project(':microshed-testing-testcontainers')
   testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.29'
-  testCompile 'org.testcontainers:mockserver:1.14.1'
+  testCompile 'org.testcontainers:mockserver:1.15.0-rc2'
   testCompile 'org.mock-server:mockserver-client-java:5.5.4'
   testCompile 'io.rest-assured:rest-assured:4.2.0'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.6.0'

sample-apps/jdbc-app/build.gradle

@@ -9,7 +9,7 @@ configurations {
 dependencies {
   providedCompile 'javax:javaee-api:8.0.1'
   providedCompile 'org.eclipse.microprofile:microprofile:2.1'
-  testCompile 'org.testcontainers:postgresql:1.14.1'
+  testCompile 'org.testcontainers:postgresql:1.15.0-rc2'
   testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.29'
   testCompile project(':microshed-testing-testcontainers')
   testImplementation 'org.junit.jupiter:junit-jupiter:5.6.0'

sample-apps/kafka-app/build.gradle

@@ -9,7 +9,7 @@ dependencies {
   compile 'org.apache.kafka:kafka-clients:2.4.0'
   testCompile project(':microshed-testing-testcontainers')
   testCompile 'org.awaitility:awaitility:4.0.2'
-  testCompile 'org.testcontainers:kafka:1.14.1'
+  testCompile 'org.testcontainers:kafka:1.15.0-rc2'
   testCompile 'org.slf4j:slf4j-log4j12:1.7.29'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.6.0'
 }

sample-apps/quarkus-app/pom.xml

@@ -88,7 +88,7 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>postgresql</artifactId>
-      <version>1.12.5</version>
+      <version>1.15.0-rc2</version>
       <scope>test</scope>
     </dependency>
     <!-- 
@@ -105,32 +105,6 @@
       <version>1.7.29</version>
       <scope>test</scope>
     </dependency>
-    
-    <!-- Temp: Force rest-assured 4.2.0 because it can integrate with JSON-B -->
-      <dependency>
-        <groupId>io.rest-assured</groupId>
-        <artifactId>rest-assured</artifactId>
-        <version>4.2.0</version>
-        <scope>test</scope>
-        <exclusions>
-          <exclusion>
-            <artifactId>activation</artifactId>
-            <groupId>javax.activation</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>javax.activation-api</artifactId>
-            <groupId>javax.activation</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>jaxb-osgi</artifactId>
-            <groupId>com.sun.xml.bind</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>commons-logging</artifactId>
-            <groupId>commons-logging</groupId>
-          </exclusion>
-        </exclusions>
-      </dependency>
   </dependencies>
   <build>
     <plugins>