Skip to content

Commit 925a75c

Browse files
authored
chore: Code restructuring. Move maven plugin into top level directory (#147)
1 parent 99908bb commit 925a75c

File tree

6 files changed

+57
-9
lines changed

6 files changed

+57
-9
lines changed
Lines changed: 56 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
33

4-
<parent>
5-
<groupId>com.google.cloud.functions.invoker</groupId>
6-
<artifactId>java-function-invoker-parent</artifactId>
7-
<version>1.1.2-SNAPSHOT</version>
8-
</parent>
9-
104
<groupId>com.google.cloud.functions</groupId>
115
<artifactId>function-maven-plugin</artifactId>
126
<packaging>maven-plugin</packaging>
@@ -16,6 +10,13 @@
1610
using the Java Functions Framework.</description>
1711
<url>http://maven.apache.org</url>
1812

13+
<scm>
14+
<url>http://github.com/GoogleCloudPlatform/functions-framework-java</url>
15+
<connection>scm:git:git://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
16+
<developerConnection>scm:git:ssh://[email protected]/GoogleCloudPlatform/functions-framework-java.git</developerConnection>
17+
<tag>HEAD</tag>
18+
</scm>
19+
1920
<properties>
2021
<maven.compiler.release>8</maven.compiler.release>
2122
<maven.compiler.source>8</maven.compiler.source>
@@ -44,7 +45,7 @@
4445
<dependency>
4546
<groupId>com.google.cloud.functions.invoker</groupId>
4647
<artifactId>java-function-invoker</artifactId>
47-
<version>1.1.2-SNAPSHOT</version>
48+
<version>1.1.1</version>
4849
</dependency>
4950

5051
<dependency>
@@ -85,4 +86,52 @@
8586
</plugin>
8687
</plugins>
8788
</build>
89+
<distributionManagement>
90+
<snapshotRepository>
91+
<id>sonatype-nexus-snapshots</id>
92+
<name>Sonatype Nexus Snapshots</name>
93+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
94+
</snapshotRepository>
95+
<repository>
96+
<id>sonatype-nexus-staging</id>
97+
<name>Nexus Release Repository</name>
98+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
99+
</repository>
100+
</distributionManagement>
101+
<profiles>
102+
<profile>
103+
<id>sonatype-oss-release</id>
104+
<build>
105+
<plugins>
106+
<plugin>
107+
<groupId>org.apache.maven.plugins</groupId>
108+
<artifactId>maven-source-plugin</artifactId>
109+
<version>3.2.1</version>
110+
<executions>
111+
<execution>
112+
<id>attach-sources</id>
113+
<goals>
114+
<goal>jar-no-fork</goal>
115+
</goals>
116+
</execution>
117+
</executions>
118+
</plugin>
119+
<plugin>
120+
<groupId>org.apache.maven.plugins</groupId>
121+
<artifactId>maven-gpg-plugin</artifactId>
122+
<version>1.6</version>
123+
<executions>
124+
<execution>
125+
<id>sign-artifacts</id>
126+
<phase>verify</phase>
127+
<goals>
128+
<goal>sign</goal>
129+
</goals>
130+
</execution>
131+
</executions>
132+
</plugin>
133+
</plugins>
134+
</build>
135+
</profile>
136+
</profiles>
88137
</project>

invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java renamed to function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java

File renamed without changes.

invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java renamed to function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java

File renamed without changes.

invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java renamed to function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java

File renamed without changes.

invoker/conformance/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<plugin>
5353
<groupId>com.google.cloud.functions</groupId>
5454
<artifactId>function-maven-plugin</artifactId>
55-
<version>0.10.2-SNAPSHOT</version>
55+
<version>0.10.1</version>
5656
</plugin>
5757
</plugins>
5858
</pluginManagement>

invoker/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<modules>
2828
<module>core</module>
2929
<module>testfunction</module>
30-
<module>function-maven-plugin</module>
3130
<module>conformance</module>
3231
</modules>
3332

0 commit comments

Comments
 (0)