From 85f1629fee5d4dcc564900602ed9da450b7b4313 Mon Sep 17 00:00:00 2001
From: Corneil du Plessis <pcorneil@vmware.com>
Date: Fri, 21 Apr 2023 11:07:43 +0200
Subject: [PATCH] Revert deploy-plugin to 2.8.2 for
 stream-applications-descriptor

---
 .github/workflows/ci-pr.yml                            |  7 +------
 functions/common/function-test-support/pom.xml         |  2 +-
 functions/function/object-detection-function/pom.xml   | 10 +++++-----
 functions/spring-functions-parent/pom.xml              |  9 ++++++++-
 .../stream-applications-descriptor/pom.xml             |  8 --------
 5 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
index 26c20ddd..3ff938c3 100644
--- a/.github/workflows/ci-pr.yml
+++ b/.github/workflows/ci-pr.yml
@@ -133,13 +133,8 @@ jobs:
         with:
           scan-type: 'fs'
           ignore-unfixed: true
-          format: 'sarif'
-          output: 'trivy-results.sarif'
+          format: 'table'
           severity: 'CRITICAL,HIGH'
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          sarif_file: 'trivy-results.sarif'
       - name: 'Scanned'
         shell: bash
         run: echo "::info ::Scanned"
diff --git a/functions/common/function-test-support/pom.xml b/functions/common/function-test-support/pom.xml
index bca7a1f7..e5f67fe9 100644
--- a/functions/common/function-test-support/pom.xml
+++ b/functions/common/function-test-support/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
         <sshd-sftp.version>2.7.0</sshd-sftp.version>
-        <apache-ftpserver.version>1.1.1</apache-ftpserver.version>
+        <apache-ftpserver.version>1.2.0</apache-ftpserver.version>
     </properties>
 
     <dependencies>
diff --git a/functions/function/object-detection-function/pom.xml b/functions/function/object-detection-function/pom.xml
index 6170a580..0ec4fdd4 100644
--- a/functions/function/object-detection-function/pom.xml
+++ b/functions/function/object-detection-function/pom.xml
@@ -17,16 +17,16 @@
 		<protobuf.version>3.19.6</protobuf.version>
 	</properties>
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud.fn</groupId>
-			<artifactId>tensorflow-common</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.google.protobuf</groupId>
 			<artifactId>protobuf-java</artifactId>
 			<version>${protobuf.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>tensorflow-common</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/functions/spring-functions-parent/pom.xml b/functions/spring-functions-parent/pom.xml
index 899aa2b0..0a7bdb11 100644
--- a/functions/spring-functions-parent/pom.xml
+++ b/functions/spring-functions-parent/pom.xml
@@ -14,8 +14,15 @@
     <groupId>org.springframework.cloud.fn</groupId>
 	<artifactId>spring-functions-parent</artifactId>
 	<packaging>pom</packaging>
-
+	<properties>
+		<protobuf.version>3.19.6</protobuf.version>
+	</properties>
 	<dependencies>
+		<dependency>
+			<groupId>com.google.protobuf</groupId>
+			<artifactId>protobuf-java</artifactId>
+			<version>${protobuf.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.fn</groupId>
 			<artifactId>config-common</artifactId>
diff --git a/stream-applications-release-train/stream-applications-descriptor/pom.xml b/stream-applications-release-train/stream-applications-descriptor/pom.xml
index cd9e65d7..862e0d35 100644
--- a/stream-applications-release-train/stream-applications-descriptor/pom.xml
+++ b/stream-applications-release-train/stream-applications-descriptor/pom.xml
@@ -30,14 +30,6 @@
         </resources>
 
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>3.0.0</version>
-                <configuration>
-                    <skip>false</skip>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>
                 <artifactId>gmavenplus-plugin</artifactId>