From f3558a4b0cbdad93a11b38bfaffeac1f4e109110 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Fri, 17 Feb 2023 14:16:46 +0100
Subject: [PATCH] Upgrade to artifactory-maven-plugin 3.5.1.

Also, switch from maven.deploy.skip to plugin-based configuration to avoid the Artifactory plugin skipping the deployment.

See #1927
---
 parent/pom.xml | 22 ++++++++++++++++++----
 pom.xml        |  2 +-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 4fe24430..b69fd177 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -274,7 +274,6 @@
 				<maven.test.skip>true</maven.test.skip>
 				<aspectj.skip>true</aspectj.skip>
 				<maven.install.skip>true</maven.install.skip>
-				<maven.deploy.skip>true</maven.deploy.skip>
 				<skipTests>true</skipTests>
 			</properties>
 
@@ -302,6 +301,14 @@
 						</configuration>
 					</plugin>
 
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-deploy-plugin</artifactId>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+
 					<!--
 						Unpacks the content of spring-data-build-resources into the shared resources folder.
 					-->
@@ -559,7 +566,6 @@
 				<maven.test.skip>true</maven.test.skip>
 				<aspectj.skip>true</aspectj.skip>
 				<maven.install.skip>true</maven.install.skip>
-				<maven.deploy.skip>true</maven.deploy.skip>
 				<skipTests>true</skipTests>
 			</properties>
 
@@ -587,6 +593,14 @@
 						</configuration>
 					</plugin>
 
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-deploy-plugin</artifactId>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+
 					<!--
 						Unpacks the content of spring-data-build-resources into the shared resources folder.
 					-->
@@ -1055,7 +1069,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-deploy-plugin</artifactId>
-					<version>3.0.0-M2</version>
+					<version>3.1.0</version>
 				</plugin>
 
 				<plugin>
@@ -1121,7 +1135,7 @@
 				<plugin>
 					<groupId>org.jfrog.buildinfo</groupId>
 					<artifactId>artifactory-maven-plugin</artifactId>
-					<version>3.4.0</version>
+					<version>3.5.1</version>
 				</plugin>
 
 			</plugins>
diff --git a/pom.xml b/pom.xml
index 31c98c9e..709433ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
 						<plugin>
 							<groupId>org.jfrog.buildinfo</groupId>
 							<artifactId>artifactory-maven-plugin</artifactId>
-							<version>3.4.0</version>
+							<version>3.5.1</version>
 							<executions>
 								<execution>
 									<id>build-info</id>