From 8f67cb8ac28be5b7f33b9abb8f14b651656387d3 Mon Sep 17 00:00:00 2001
From: David Turanski <dturanski@vmware.com>
Date: Mon, 25 Jan 2021 12:08:34 -0500
Subject: [PATCH] Disable tests by default and fix Testcontainers version

---
 .../couchbase-sink/pom.xml                    |  5 +++--
 .../couchbase-stream-applications/pom.xml     | 20 ++-----------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/function-based-stream-app-samples/couchbase-stream-applications/couchbase-sink/pom.xml b/function-based-stream-app-samples/couchbase-stream-applications/couchbase-sink/pom.xml
index 256a333..b8f09b4 100644
--- a/function-based-stream-app-samples/couchbase-stream-applications/couchbase-sink/pom.xml
+++ b/function-based-stream-app-samples/couchbase-stream-applications/couchbase-sink/pom.xml
@@ -62,7 +62,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>stream-applications-test-support</artifactId>
-			<version>3.0.0-RC1</version>
+			<version>3.0.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -89,6 +89,7 @@
 								<include>*IntegrationTests.java</include>
 							</includes>
 							<failIfNoTests>true</failIfNoTests>
+							<skipITs>false</skipITs>
 						</configuration>
 					</plugin>
 					<plugin>
@@ -96,7 +97,7 @@
 						<artifactId>spring-boot-maven-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>build-imagage</id>
+								<id>build-image</id>
 								<goals>
 									<goal>build-image</goal>
 								</goals>
diff --git a/function-based-stream-app-samples/couchbase-stream-applications/pom.xml b/function-based-stream-app-samples/couchbase-stream-applications/pom.xml
index 855307e..963557f 100644
--- a/function-based-stream-app-samples/couchbase-stream-applications/pom.xml
+++ b/function-based-stream-app-samples/couchbase-stream-applications/pom.xml
@@ -20,7 +20,7 @@
 		<spring-cloud.version>2020.0.0-M5</spring-cloud.version>
 		<playtika-testcontainers.version>1.86</playtika-testcontainers.version>
 		<couchbase-java-client.version>3.0.10</couchbase-java-client.version>
-		<test-containers.version>1.15.0</test-containers.version>
+		<test-containers.version>1.15.1</test-containers.version>
 	</properties>
 
 
@@ -78,23 +78,6 @@
 		</pluginRepository>
 	</pluginRepositories>
 
-	<profiles>
-		<profile>
-			<id>integration</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<groups>integration</groups>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -102,6 +85,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
 					<groups>!integration</groups>
+					<skipTests>true</skipTests>
 				</configuration>
 			</plugin>
 		</plugins>