diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml index 5c56a303..70df0e5f 100644 --- a/.github/workflows/conformance.yaml +++ b/.github/workflows/conformance.yaml @@ -33,6 +33,9 @@ jobs: - 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: diff --git a/invoker/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml similarity index 56% rename from invoker/function-maven-plugin/pom.xml rename to function-maven-plugin/pom.xml index 67b34ffd..3a31815c 100644 --- a/invoker/function-maven-plugin/pom.xml +++ b/function-maven-plugin/pom.xml @@ -1,21 +1,22 @@ 4.0.0 - - com.google.cloud.functions.invoker - java-function-invoker-parent - 1.1.2-SNAPSHOT - - com.google.cloud.functions function-maven-plugin maven-plugin - 0.10.2-SNAPSHOT + 0.10.3-SNAPSHOT Functions Framework Plugin A Maven plugin that allows functions to be deployed, and to be run locally using the Java Functions Framework. http://maven.apache.org + + http://github.com/GoogleCloudPlatform/functions-framework-java + scm:git:git://github.com/GoogleCloudPlatform/functions-framework-java.git + scm:git:ssh://git@github.com/GoogleCloudPlatform/functions-framework-java.git + HEAD + + 8 8 @@ -44,7 +45,7 @@ com.google.cloud.functions.invoker java-function-invoker - 1.1.2-SNAPSHOT + 1.1.1 @@ -85,4 +86,52 @@ + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + sonatype-oss-release + + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + + + 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/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 @@ com.google.cloud.functions function-maven-plugin - 0.10.2-SNAPSHOT + 0.10.1 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 @@ core testfunction - function-maven-plugin conformance