From 1b199b80de66213dcd44adddfe3532707ae71e2b Mon Sep 17 00:00:00 2001
From: Corneil du Plessis <pcorneil@vmware.com>
Date: Tue, 18 Oct 2022 23:47:22 +0200
Subject: [PATCH] [SB3 Build] Adding dependencies to functions-dependencies.
 (#375)

---
 build-app.sh                            | 18 ++++++++++++------
 build-core.sh                           | 13 +++++++++----
 functions/function-dependencies/pom.xml | 10 ++++++++++
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/build-app.sh b/build-app.sh
index 95b0ced8..ea85068d 100755
--- a/build-app.sh
+++ b/build-app.sh
@@ -34,26 +34,32 @@ else
   MAVEN_OPT=-q
 fi
 
+if [ "$LOCAL" == "true" ]; then
+  MAVEN_GOAL="install"
+else
+  MAVEN_GOAL="install deploy"
+fi
+
 pushd $APP_FOLDER > /dev/null
   rm -rf apps
   if [ -d "src/main/java" ]; then
     echo "Deploying:$APP_FOLDER"
-    $ROOT_DIR/mvnw $MAVEN_OPT -s $ROOT_DIR/.settings.xml clean deploy -U -Pintegration
+    $ROOT_DIR/mvnw $MAVEN_OPT -s $ROOT_DIR/.settings.xml clean $MAVEN_GOAL -U -Pintegration
   else
     echo "Packaging:$APP_FOLDER"
-    $ROOT_DIR/mvnw $MAVEN_OPT -s $ROOT_DIR/.settings.xml clean package -U -Pintegration
+    $ROOT_DIR/mvnw $MAVEN_OPT -s $ROOT_DIR/.settings.xml clean install -U -Pintegration
   fi
   if [ ! -d apps ]; then
     echo "Cannot find $APP_FOLDER/apps"
     exit 2
   fi
-  pushd apps
+  pushd apps > /dev/null
     echo "Building:$APP_FOLDER/apps"
-    ./mvnw $MAVEN_OPT install deploy -U -Pintegration
+    ./mvnw $MAVEN_OPT $MAVEN_GOAL -U -Pintegration
     ./mvnw $MAVEN_OPT package jib:build -DskipTests \
                   -Djib.to.tags="$VERSION" \
                   -Djib.httpTimeout=1800000 \
                   -Djib.to.auth.username="$DOCKER_HUB_USERNAME" \
                   -Djib.to.auth.password="$DOCKER_HUB_PASSWORD"
-  popd
-popd
+  popd > /dev/null
+popd > /dev/null
diff --git a/build-core.sh b/build-core.sh
index e9f7e65f..efb2ce33 100755
--- a/build-core.sh
+++ b/build-core.sh
@@ -18,7 +18,12 @@ if [ "$VERBOSE" == "true" ]; then
 else
   MAVEN_OPT=-q
 fi
-./mvnw $MAVEN_OPT -s ./.settings.xml install deploy -f stream-applications-build -U
-./mvnw $MAVEN_OPT -s ./.settings.xml install deploy -f functions -N -U
-./mvnw $MAVEN_OPT -s ./.settings.xml install deploy -f functions/function-dependencies -N -U
-./mvnw $MAVEN_OPT -s ./.settings.xml install deploy -f applications/stream-applications-core -N -U
+if [ "$LOCAL" == "true" ]; then
+  MAVEN_GOAL="install"
+else
+  MAVEN_GOAL="install deploy"
+fi
+./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -f stream-applications-build -U
+./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -f functions -N -U
+./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -f functions/function-dependencies -N -U
+./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -f applications/stream-applications-core -N -U
diff --git a/functions/function-dependencies/pom.xml b/functions/function-dependencies/pom.xml
index 516e3f81..ae520ad9 100644
--- a/functions/function-dependencies/pom.xml
+++ b/functions/function-dependencies/pom.xml
@@ -278,6 +278,16 @@
                <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+                <version>3.1.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-sleuth</artifactId>
+                <version>3.1.4</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>