From 9867e6163a6793caeb0d90a406cbd18dbd4f3226 Mon Sep 17 00:00:00 2001
From: Glenn Renfro <grenfro@vmware.com>
Date: Thu, 10 Nov 2022 12:44:48 -0500
Subject: [PATCH] Added scripts to build the docker images (#185)

This is to match the scripts that are available in the Acceptance tests.  So that if they want to build samples for testing purposes they have a consistent feel
Also updated versions
---
 timestamp-batch/build-timestamp-batch-image.sh |  6 ++++++
 timestamp-batch/pom.xml                        | 17 ++---------------
 timestamp-task/build-timestamp-image.sh        |  6 ++++++
 timestamp-task/pom.xml                         | 17 ++---------------
 4 files changed, 16 insertions(+), 30 deletions(-)
 create mode 100755 timestamp-batch/build-timestamp-batch-image.sh
 create mode 100755 timestamp-task/build-timestamp-image.sh

diff --git a/timestamp-batch/build-timestamp-batch-image.sh b/timestamp-batch/build-timestamp-batch-image.sh
new file mode 100755
index 0000000..b6fbd43
--- /dev/null
+++ b/timestamp-batch/build-timestamp-batch-image.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+if [ "$TIMESTAMP_BATCH_TASK_VERSION" = "" ]; then
+  TIMESTAMP_BATCH_TASK_VERSION=2.0.2
+fi
+./mvnw -o clean install -DskipTests
+./mvnw -o spring-boot:build-image -DskipTests -Dspring-boot.build-image.imageName=springcloud/timestamp-batch-task:$TIMESTAMP_BATCH_TASK_VERSION
diff --git a/timestamp-batch/pom.xml b/timestamp-batch/pom.xml
index d1aa541..29769ec 100644
--- a/timestamp-batch/pom.xml
+++ b/timestamp-batch/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.3</version>
+		<version>2.7.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.spring</groupId>
@@ -16,8 +16,7 @@
 
 	<properties>
 		<java.version>8</java.version>
-		<spring-cloud.version>2021.0.0</spring-cloud.version>
-		<oracle-jdbc.version>21.1.0.0</oracle-jdbc.version>
+		<spring-cloud.version>2021.0.5</spring-cloud.version>
 	</properties>
 
 	<dependencies>
@@ -35,11 +34,6 @@
 			<artifactId>postgresql</artifactId>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.oracle.database.jdbc</groupId>
-			<artifactId>ojdbc8</artifactId>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
@@ -71,13 +65,6 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>com.oracle.database.jdbc</groupId>
-				<artifactId>ojdbc-bom</artifactId>
-				<version>${oracle-jdbc.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
diff --git a/timestamp-task/build-timestamp-image.sh b/timestamp-task/build-timestamp-image.sh
new file mode 100755
index 0000000..6af4008
--- /dev/null
+++ b/timestamp-task/build-timestamp-image.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+if [ "$TIMESTAMP_TASK_VERSION" = "" ]; then
+  TIMESTAMP_TASK_VERSION=2.0.2
+fi
+./mvnw -o clean install -DskipTests
+./mvnw -o spring-boot:build-image -DskipTests -Dspring-boot.build-image.imageName=springcloud/timestamp-task:$TIMESTAMP_TASK_VERSION
diff --git a/timestamp-task/pom.xml b/timestamp-task/pom.xml
index f67a85c..9c20437 100644
--- a/timestamp-task/pom.xml
+++ b/timestamp-task/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.3</version>
+		<version>2.7.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.spring</groupId>
@@ -16,8 +16,7 @@
 
 	<properties>
 		<java.version>8</java.version>
-		<spring-cloud.version>2021.0.0</spring-cloud.version>
-		<oracle-jdbc.version>21.1.0.0</oracle-jdbc.version>
+		<spring-cloud.version>2021.0.5</spring-cloud.version>
 	</properties>
 
 	<dependencies>
@@ -35,11 +34,6 @@
 			<artifactId>postgresql</artifactId>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.oracle.database.jdbc</groupId>
-			<artifactId>ojdbc8</artifactId>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
@@ -62,13 +56,6 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>com.oracle.database.jdbc</groupId>
-				<artifactId>ojdbc-bom</artifactId>
-				<version>${oracle-jdbc.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>