From 0aa7da720cc89c59345659731c52580288b6e90e Mon Sep 17 00:00:00 2001
From: Jessica Chen <jessicac@devrestricted-jessicac.ec2.pin220.com>
Date: Thu, 29 Feb 2024 01:26:38 +0000
Subject: [PATCH 1/5] migrate to artifactory-push

---
 deploy-service/universal/pom.xml | 62 ++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/deploy-service/universal/pom.xml b/deploy-service/universal/pom.xml
index ff15487d85..4f8597f4d4 100644
--- a/deploy-service/universal/pom.xml
+++ b/deploy-service/universal/pom.xml
@@ -144,6 +144,68 @@
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
           <version>2.8.2</version>
+          <configuration>  
+            <skip>true</skip>  
+          </configuration>
+        </plugin>
+        <plugin>  
+          <groupId>org.codehaus.gmavenplus</groupId>
+          <artifactId>gmavenplus-plugin</artifactId>
+          <version>3.0.2</version>
+          <executions>
+            <execution>
+              <phase>package</phase>
+              <goals>
+                <goal>execute</goal>
+              </goals>
+              <configuration>
+                <scripts>
+                  <script>
+                    def version = project.version
+                    def type = version.contains('SNAPSHOT') ? 'snapshot' : 'release'
+                    project.properties['deployment.type'] = type
+                  </script>
+                </scripts>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>  
+          <groupId>org.codehaus.mojo</groupId>  
+          <artifactId>exec-maven-plugin</artifactId>  
+          <version>3.2.0</version>  
+          <executions>  
+            <execution>  
+              <id>artifactory-push-deploy</id>
+              <phase>deploy</phase>
+              <goals>
+                <goal>exec</goal>
+              </goals>
+              <configuration>
+                <executable>artifactory-push</executable>
+                <arguments>
+                  <argument>--env</argument>
+                  <argument>prod</argument>
+                  <argument>--type</argument>
+                  <argument>${deployment.type}</argument>
+                  <argument>--maven_group_id</argument>
+                  <argument>${project.groupId}</argument>
+                  <argument>--maven_artifact_id</argument>
+                  <argument>${project.artifactId}</argument>
+                  <argument>--maven_version</argument>
+                  <argument>${project.version}</argument>
+                  <argument>--maven_pom</argument>
+                  <argument>${project.file.path}</argument>
+                  <argument>--maven_jar</argument>
+                  <argument>${project.build.directory}/${project.build.finalName}.jar</argument>
+                  <argument>--maven_jar_src</argument>
+                  <argument>${project.build.directory}/${project.build.finalName}-sources.jar</argument>
+                  <argument>--to_repo</argument>
+                  <argument>test-maven</argument>
+                </arguments>
+              </configuration>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <artifactId>maven-project-info-reports-plugin</artifactId>

From 08943cd42c600d92608b96e403d67cca47cfcaf9 Mon Sep 17 00:00:00 2001
From: Jessica Chen <jessicac@devrestricted-jessicac.ec2.pin220.com>
Date: Mon, 4 Mar 2024 01:18:02 +0000
Subject: [PATCH 2/5] move plugins outside of pluginManagement

---
 deploy-service/universal/pom.xml | 118 +++++++++++++++----------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/deploy-service/universal/pom.xml b/deploy-service/universal/pom.xml
index 4f8597f4d4..e941bdb273 100644
--- a/deploy-service/universal/pom.xml
+++ b/deploy-service/universal/pom.xml
@@ -148,65 +148,6 @@
             <skip>true</skip>  
           </configuration>
         </plugin>
-        <plugin>  
-          <groupId>org.codehaus.gmavenplus</groupId>
-          <artifactId>gmavenplus-plugin</artifactId>
-          <version>3.0.2</version>
-          <executions>
-            <execution>
-              <phase>package</phase>
-              <goals>
-                <goal>execute</goal>
-              </goals>
-              <configuration>
-                <scripts>
-                  <script>
-                    def version = project.version
-                    def type = version.contains('SNAPSHOT') ? 'snapshot' : 'release'
-                    project.properties['deployment.type'] = type
-                  </script>
-                </scripts>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>  
-          <groupId>org.codehaus.mojo</groupId>  
-          <artifactId>exec-maven-plugin</artifactId>  
-          <version>3.2.0</version>  
-          <executions>  
-            <execution>  
-              <id>artifactory-push-deploy</id>
-              <phase>deploy</phase>
-              <goals>
-                <goal>exec</goal>
-              </goals>
-              <configuration>
-                <executable>artifactory-push</executable>
-                <arguments>
-                  <argument>--env</argument>
-                  <argument>prod</argument>
-                  <argument>--type</argument>
-                  <argument>${deployment.type}</argument>
-                  <argument>--maven_group_id</argument>
-                  <argument>${project.groupId}</argument>
-                  <argument>--maven_artifact_id</argument>
-                  <argument>${project.artifactId}</argument>
-                  <argument>--maven_version</argument>
-                  <argument>${project.version}</argument>
-                  <argument>--maven_pom</argument>
-                  <argument>${project.file.path}</argument>
-                  <argument>--maven_jar</argument>
-                  <argument>${project.build.directory}/${project.build.finalName}.jar</argument>
-                  <argument>--maven_jar_src</argument>
-                  <argument>${project.build.directory}/${project.build.finalName}-sources.jar</argument>
-                  <argument>--to_repo</argument>
-                  <argument>test-maven</argument>
-                </arguments>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
         <plugin>
           <artifactId>maven-project-info-reports-plugin</artifactId>
           <version>3.0.0</version>
@@ -226,6 +167,65 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>  
+        <groupId>org.codehaus.gmavenplus</groupId>
+        <artifactId>gmavenplus-plugin</artifactId>
+        <version>3.0.2</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>execute</goal>
+            </goals>
+            <configuration>
+              <scripts>
+                <script>
+                  def version = project.version
+                  def type = version.contains('SNAPSHOT') ? 'snapshot' : 'release'
+                  project.properties['deployment.type'] = type
+                </script>
+              </scripts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>  
+        <groupId>org.codehaus.mojo</groupId>  
+        <artifactId>exec-maven-plugin</artifactId>  
+        <version>3.2.0</version>  
+        <executions>  
+          <execution>  
+            <id>artifactory-push-deploy</id>
+            <phase>deploy</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>artifactory-push</executable>
+              <arguments>
+                <argument>--env</argument>
+                <argument>prod</argument>
+                <argument>--type</argument>
+                <argument>${deployment.type}</argument>
+                <argument>--maven_group_id</argument>
+                <argument>${project.groupId}</argument>
+                <argument>--maven_artifact_id</argument>
+                <argument>${project.artifactId}</argument>
+                <argument>--maven_version</argument>
+                <argument>${project.version}</argument>
+                <argument>--maven_pom</argument>
+                <argument>${project.file.path}</argument>
+                <argument>--maven_jar</argument>
+                <argument>${project.build.directory}/${project.build.finalName}.jar</argument>
+                <argument>--maven_jar_src</argument>
+                <argument>${project.build.directory}/${project.build.finalName}-sources.jar</argument>
+                <argument>--to_repo</argument>
+                <argument>test-maven</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file

From 1a52a093e5641b155f92e03d7e1581a4d67b9f52 Mon Sep 17 00:00:00 2001
From: Jessica Chen <jessicac@devrestricted-jessicac.ec2.pin220.com>
Date: Mon, 4 Mar 2024 01:42:26 +0000
Subject: [PATCH 3/5] cleanup

---
 deploy-service/pom.xml           | 13 ------------
 deploy-service/universal/pom.xml | 35 +++++++-------------------------
 2 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/deploy-service/pom.xml b/deploy-service/pom.xml
index 12284f2a01..6d2fc23c80 100644
--- a/deploy-service/pom.xml
+++ b/deploy-service/pom.xml
@@ -106,19 +106,6 @@
         </plugins>
     </build>
 
-    <distributionManagement>
-        <repository>
-            <id>central</id>
-            <name>maven-releases</name>
-            <url>https://artifacts-prod-use1.pinadmin.com/artifactory/maven-private-prod-sox-local</url>
-        </repository>
-        <snapshotRepository>
-            <id>snapshots</id>
-            <name>maven-snapshots</name>
-            <url>https://artifacts-prod-use1.pinadmin.com/artifactory/maven-private-prod-sox-local</url>
-        </snapshotRepository>
-    </distributionManagement>
-
     <profiles>
         <profile>
             <id>coverage</id>
diff --git a/deploy-service/universal/pom.xml b/deploy-service/universal/pom.xml
index e941bdb273..51b5d87e6f 100644
--- a/deploy-service/universal/pom.xml
+++ b/deploy-service/universal/pom.xml
@@ -167,34 +167,12 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>  
-        <groupId>org.codehaus.gmavenplus</groupId>
-        <artifactId>gmavenplus-plugin</artifactId>
-        <version>3.0.2</version>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>3.0.0</version>  
         <executions>
           <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>execute</goal>
-            </goals>
-            <configuration>
-              <scripts>
-                <script>
-                  def version = project.version
-                  def type = version.contains('SNAPSHOT') ? 'snapshot' : 'release'
-                  project.properties['deployment.type'] = type
-                </script>
-              </scripts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>  
-        <groupId>org.codehaus.mojo</groupId>  
-        <artifactId>exec-maven-plugin</artifactId>  
-        <version>3.2.0</version>  
-        <executions>  
-          <execution>  
             <id>artifactory-push-deploy</id>
             <phase>deploy</phase>
             <goals>
@@ -203,9 +181,10 @@
             <configuration>
               <executable>artifactory-push</executable>
               <arguments>
+                <argument>maven</argument>
                 <argument>--env</argument>
                 <argument>prod</argument>
-                <argument>--type</argument>
+                <argument>--maven_type</argument>
                 <argument>${deployment.type}</argument>
                 <argument>--maven_group_id</argument>
                 <argument>${project.groupId}</argument>
@@ -220,7 +199,7 @@
                 <argument>--maven_jar_src</argument>
                 <argument>${project.build.directory}/${project.build.finalName}-sources.jar</argument>
                 <argument>--to_repo</argument>
-                <argument>test-maven</argument>
+                <argument>maven-private-prod-sox-local</argument>
               </arguments>
             </configuration>
           </execution>

From f2476bb475f5791fa7ad50933cac458d95273b60 Mon Sep 17 00:00:00 2001
From: Jessica Chen <jessicac@devrestricted-jessicac.ec2.pin220.com>
Date: Mon, 4 Mar 2024 17:44:11 +0000
Subject: [PATCH 4/5] remove settings.xml

---
 deploy-service/settings.xml | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 deploy-service/settings.xml

diff --git a/deploy-service/settings.xml b/deploy-service/settings.xml
deleted file mode 100644
index 8937cab3ca..0000000000
--- a/deploy-service/settings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd" xmlns="http://maven.apache.org/SETTINGS/1.1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <servers>
-    <server>
-      <username>${ARTIFACTORY_USER}</username>
-      <password>${ARTIFACTORY_TOKEN}</password>
-      <id>central</id>
-    </server>
-    <server>
-      <username>${ARTIFACTORY_USER}</username>
-      <password>${ARTIFACTORY_TOKEN}</password>
-      <id>snapshots</id>
-    </server>
-  </servers>
-</settings>

From fc2427c7c90bbe1607a03017d4c684d6e2522230 Mon Sep 17 00:00:00 2001
From: Jessica Chen <jessicac@devrestricted-jessicac.ec2.pin220.com>
Date: Mon, 4 Mar 2024 17:51:01 +0000
Subject: [PATCH 5/5] add comments

---
 deploy-service/universal/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/deploy-service/universal/pom.xml b/deploy-service/universal/pom.xml
index 51b5d87e6f..e0da90ffa2 100644
--- a/deploy-service/universal/pom.xml
+++ b/deploy-service/universal/pom.xml
@@ -168,6 +168,8 @@
         </executions>
       </plugin>
       <plugin>
+        <!-- This is Pinterest deployment specific. -->
+        <!-- For non-Pinterest deployments, remove this block and use the maven-deploy-plugin instead. -->
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
         <version>3.0.0</version>