From b1772eb2eb0f022feb4d4c38f51d69cb103a7fb0 Mon Sep 17 00:00:00 2001
From: Pratiksha Kap <pratikshakap@google.com>
Date: Thu, 1 Sep 2022 10:08:29 -0700
Subject: [PATCH 1/8] move the maven plugin module out of invoker

---
 .../pom.xml                                   |  0
 function-maven-plugin/pom.xml.versionsBackup  | 88 +++++++++++++++++++
 .../functions/plugin/DeployFunction.java      |  0
 .../cloud/functions/plugin/RunFunction.java   |  0
 .../functions/plugin/DeployFunctionTest.java  |  0
 invoker/pom.xml                               |  1 -
 6 files changed, 88 insertions(+), 1 deletion(-)
 rename {invoker/function-maven-plugin => function-maven-plugin}/pom.xml (100%)
 create mode 100644 function-maven-plugin/pom.xml.versionsBackup
 rename {invoker/function-maven-plugin => function-maven-plugin}/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java (100%)
 rename {invoker/function-maven-plugin => function-maven-plugin}/src/main/java/com/google/cloud/functions/plugin/RunFunction.java (100%)
 rename {invoker/function-maven-plugin => function-maven-plugin}/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java (100%)

diff --git a/invoker/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
similarity index 100%
rename from invoker/function-maven-plugin/pom.xml
rename to function-maven-plugin/pom.xml
diff --git a/function-maven-plugin/pom.xml.versionsBackup b/function-maven-plugin/pom.xml.versionsBackup
new file mode 100644
index 00000000..bb3ee58a
--- /dev/null
+++ b/function-maven-plugin/pom.xml.versionsBackup
@@ -0,0 +1,88 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.google.cloud.functions.invoker</groupId>
+    <artifactId>java-function-invoker-parent</artifactId>
+    <version>1.1.1-SNAPSHOT</version>
+  </parent>
+
+  <groupId>com.google.cloud.functions</groupId>
+  <artifactId>function-maven-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <version>0.10.1-SNAPSHOT</version>
+  <name>Functions Framework Plugin</name>
+  <description>A Maven plugin that allows functions to be deployed, and to be run locally
+    using the Java Functions Framework.</description>
+  <url>http://maven.apache.org</url>
+
+  <properties>
+    <maven.compiler.release>8</maven.compiler.release>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>3.6.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
+      <version>3.6.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>3.6.0</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.cloud.functions.invoker</groupId>
+      <artifactId>java-function-invoker</artifactId>
+      <version>1.1.1-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.cloud.tools</groupId>
+      <artifactId>appengine-maven-plugin</artifactId>
+      <version>2.4.1</version>
+      <type>jar</type>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>1.0.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>3.6.0</version>
+        <executions>
+          <execution>
+            <id>help-goal</id>
+            <goals>
+              <goal>helpmojo</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java b/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
similarity index 100%
rename from invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
rename to function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
diff --git a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java b/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
similarity index 100%
rename from invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
rename to function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
diff --git a/invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java b/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
similarity index 100%
rename from invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
rename to function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 80862acf..86bcb069 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -27,7 +27,6 @@
   <modules>
     <module>core</module>
     <module>testfunction</module>
-    <module>function-maven-plugin</module>
     <module>conformance</module>
   </modules>
 

From 2d0706dfd45405e75b1f3c37c1f2a37bc2eee567 Mon Sep 17 00:00:00 2001
From: Pratiksha Kap <pratikshakap@google.com>
Date: Thu, 1 Sep 2022 10:31:34 -0700
Subject: [PATCH 2/8] remove the backup file

---
 function-maven-plugin/pom.xml.versionsBackup | 88 --------------------
 1 file changed, 88 deletions(-)
 delete mode 100644 function-maven-plugin/pom.xml.versionsBackup

diff --git a/function-maven-plugin/pom.xml.versionsBackup b/function-maven-plugin/pom.xml.versionsBackup
deleted file mode 100644
index bb3ee58a..00000000
--- a/function-maven-plugin/pom.xml.versionsBackup
+++ /dev/null
@@ -1,88 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.google.cloud.functions.invoker</groupId>
-    <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
-  </parent>
-
-  <groupId>com.google.cloud.functions</groupId>
-  <artifactId>function-maven-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
-  <version>0.10.1-SNAPSHOT</version>
-  <name>Functions Framework Plugin</name>
-  <description>A Maven plugin that allows functions to be deployed, and to be run locally
-    using the Java Functions Framework.</description>
-  <url>http://maven.apache.org</url>
-
-  <properties>
-    <maven.compiler.release>8</maven.compiler.release>
-    <maven.compiler.source>8</maven.compiler.source>
-    <maven.compiler.target>8</maven.compiler.target>
-  </properties>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>3.6.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>3.6.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.6.0</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.cloud.functions.invoker</groupId>
-      <artifactId>java-function-invoker</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.cloud.tools</groupId>
-      <artifactId>appengine-maven-plugin</artifactId>
-      <version>2.4.1</version>
-      <type>jar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>1.0.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.6.0</version>
-        <executions>
-          <execution>
-            <id>help-goal</id>
-            <goals>
-              <goal>helpmojo</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

From e8ce71e5c4a0c069f345edf399fa84a27d74a366 Mon Sep 17 00:00:00 2001
From: Pratiksha Kap <pratikshakap@google.com>
Date: Thu, 1 Sep 2022 14:26:38 -0700
Subject: [PATCH 3/8] fix conformance test

---
 .github/workflows/conformance.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 5c56a303..4821011c 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -30,6 +30,9 @@ jobs:
     - name: Build API with Maven
       run: (cd functions-framework-api/ && mvn install)
 
+    - name: Build function-maven-plugin with Maven
+      run: (cd function-maven-plugin/ && mvn install)
+
     - name: Build invoker with Maven
       run: (cd invoker/ && mvn install)
 

From 2d30330e3ac54e8354e00c048ebb640c32c48548 Mon Sep 17 00:00:00 2001
From: Pratiksha Kap <pratikshakap@google.com>
Date: Thu, 1 Sep 2022 14:33:55 -0700
Subject: [PATCH 4/8] remove parent tag

---
 function-maven-plugin/pom.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 67b34ffd..fb4ad74d 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -1,12 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.google.cloud.functions.invoker</groupId>
-    <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
-  </parent>
-
+  
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>

From c251ff4aa6bf6abc1c3aaaa9ef37c282bf62b38f Mon Sep 17 00:00:00 2001
From: Pratiksha Kap <pratikshakap@google.com>
Date: Thu, 1 Sep 2022 14:44:23 -0700
Subject: [PATCH 5/8] fix dependency issue

---
 .github/workflows/conformance.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 4821011c..70df0e5f 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -30,12 +30,12 @@ jobs:
     - name: Build API with Maven
       run: (cd functions-framework-api/ && mvn install)
 
-    - name: Build function-maven-plugin with Maven
-      run: (cd function-maven-plugin/ && mvn install)
-
     - name: Build invoker with Maven
       run: (cd invoker/ && mvn install)
 
+    - name: Build function-maven-plugin with Maven
+      run: (cd function-maven-plugin/ && mvn install)
+
     - name: Run HTTP conformance tests
       uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.6.0
       with:

From 3c5c865a8ce1bf49648a72abf0f45a6e86380c9d Mon Sep 17 00:00:00 2001
From: Pratiksha Kap <pratikshakap@google.com>
Date: Thu, 1 Sep 2022 16:28:28 -0700
Subject: [PATCH 6/8] adding oss information

---
 function-maven-plugin/pom.xml | 59 +++++++++++++++++++++++++++++++++--
 invoker/conformance/pom.xml   |  2 +-
 2 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index fb4ad74d..b449bd75 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -1,6 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  
+
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
@@ -10,6 +10,13 @@
     using the Java Functions Framework.</description>
   <url>http://maven.apache.org</url>
 
+  <scm>
+    <url>http://github.com/GoogleCloudPlatform/functions-framework-java</url>
+    <connection>scm:git:git://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/GoogleCloudPlatform/functions-framework-java.git</developerConnection>
+    <tag>HEAD</tag>
+  </scm>
+
   <properties>
     <maven.compiler.release>8</maven.compiler.release>
     <maven.compiler.source>8</maven.compiler.source>
@@ -38,7 +45,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.1.2-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
 
     <dependency>
@@ -79,4 +86,52 @@
       </plugin>
     </plugins>
   </build>
+    <distributionManagement>
+    <snapshotRepository>
+      <id>sonatype-nexus-snapshots</id>
+      <name>Sonatype Nexus Snapshots</name>
+      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+    </snapshotRepository>
+    <repository>
+      <id>sonatype-nexus-staging</id>
+      <name>Nexus Release Repository</name>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>
+  </distributionManagement>
+  <profiles>
+    <profile>
+      <id>sonatype-oss-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>3.2.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.6</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 0a34c40d..06b13b59 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -52,7 +52,7 @@
         <plugin>
           <groupId>com.google.cloud.functions</groupId>
           <artifactId>function-maven-plugin</artifactId>
-          <version>0.10.2-SNAPSHOT</version>
+          <version>0.10.1</version>
         </plugin>
       </plugins>
     </pluginManagement>

From a453af1eb7829126740c8643ea8bd1c3f93811c1 Mon Sep 17 00:00:00 2001
From: Pratiksha Kap <pratikshakap@google.com>
Date: Thu, 1 Sep 2022 16:35:58 -0700
Subject: [PATCH 7/8] [maven-release-plugin] prepare release
 function-maven-plugin-0.10.2

---
 function-maven-plugin/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index b449bd75..dbd87c67 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.10.2-SNAPSHOT</version>
+  <version>0.10.2</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -14,7 +14,7 @@
     <url>http://github.com/GoogleCloudPlatform/functions-framework-java</url>
     <connection>scm:git:git://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/GoogleCloudPlatform/functions-framework-java.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>function-maven-plugin-0.10.2</tag>
   </scm>
 
   <properties>

From e92390422000163efa651da9f8adc945a68e712d Mon Sep 17 00:00:00 2001
From: Pratiksha Kap <pratikshakap@google.com>
Date: Thu, 1 Sep 2022 16:36:57 -0700
Subject: [PATCH 8/8] [maven-release-plugin] prepare for next development
 iteration

---
 function-maven-plugin/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index dbd87c67..3a31815c 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.10.2</version>
+  <version>0.10.3-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -14,7 +14,7 @@
     <url>http://github.com/GoogleCloudPlatform/functions-framework-java</url>
     <connection>scm:git:git://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/GoogleCloudPlatform/functions-framework-java.git</developerConnection>
-    <tag>function-maven-plugin-0.10.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <properties>