From 7349be38e52d83aa7e8ce44108eddbb94d4d80e3 Mon Sep 17 00:00:00 2001
From: David Turanski <dturanski@vmware.com>
Date: Fri, 11 Dec 2020 10:06:23 -0500
Subject: [PATCH] Fix build and add integration profile

---
 .../couchbase-stream-applications/README.adoc |  5 ++
 .../couchbase-sink/pom.xml                    | 78 ++++++++++---------
 .../couchbase-stream-applications/pom.xml     | 31 +++++++-
 3 files changed, 77 insertions(+), 37 deletions(-)

diff --git a/function-based-stream-app-samples/couchbase-stream-applications/README.adoc b/function-based-stream-app-samples/couchbase-stream-applications/README.adoc
index 5209fe0..83775ce 100644
--- a/function-based-stream-app-samples/couchbase-stream-applications/README.adoc
+++ b/function-based-stream-app-samples/couchbase-stream-applications/README.adoc
@@ -11,4 +11,9 @@ This project includes the following modules:
 
 ```bash
 ./mvnw clean install
+```
+
+=== Build container image and run integration tests
+```bash
+./mvnw install -Pintegration
 ```
\ No newline at end of file
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 54cc9d6..256a333 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
@@ -67,39 +67,53 @@
 		</dependency>
 	</dependencies>
 
+	<profiles>
+		<profile>
+			<id>integration</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-failsafe-plugin</artifactId>
+						<dependencies>
+							<dependency>
+								<groupId>org.junit.jupiter</groupId>
+								<artifactId>junit-jupiter-engine</artifactId>
+								<version>5.7.0</version>
+							</dependency>
+						</dependencies>
+
+						<configuration>
+							<groups>integration</groups>
+							<includes>
+								<include>*IntegrationTests.java</include>
+							</includes>
+							<failIfNoTests>true</failIfNoTests>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.springframework.boot</groupId>
+						<artifactId>spring-boot-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>build-imagage</id>
+								<goals>
+									<goal>build-image</goal>
+								</goals>
+								<phase>pre-integration-test</phase>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-				<dependencies>
-					<dependency>
-						<groupId>org.junit.jupiter</groupId>
-						<artifactId>junit-jupiter-engine</artifactId>
-						<version>5.7.0</version>
-					</dependency>
-				</dependencies>
-
-				<configuration>
-					<groups>integration</groups>
-					<includes>
-						<include>*IntegrationTests.java</include>
-					</includes>
-					<failIfNoTests>true</failIfNoTests>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>build-imagage</id>
-						<goals>
-							<goal>build-image</goal>
-						</goals>
-						<phase>pre-integration-test</phase>
-					</execution>
-				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.springframework.cloud</groupId>
@@ -115,14 +129,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<groups>!integration</groups>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
-
 </project>
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 591137c..855307e 100644
--- a/function-based-stream-app-samples/couchbase-stream-applications/pom.xml
+++ b/function-based-stream-app-samples/couchbase-stream-applications/pom.xml
@@ -16,7 +16,7 @@
 	<description>Demo Stream Applications project for Couchhbase</description>
 
 	<properties>
-		<java.version>11</java.version>
+		<java.version>8</java.version>
 		<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>
@@ -78,5 +78,34 @@
 		</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>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<groups>!integration</groups>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
 
 </project>