Skip to content

functions: shrink example pom sample #2845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 6, 2020
Merged

functions: shrink example pom sample #2845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c21fc6e
functions: shrink example pom sample
May 6, 2020
e6870ca
Use helloWorld POM instead (per original discussion)
May 6, 2020
8bd921a
Remove example-pom tags from firebase (in favor of helloworld)
May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions functions/firebase/firestore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
limitations under the License.
-->

<!-- [START functions_example_pom] -->
<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/xsd/maven-4.0.0.xsd">
Expand All @@ -25,14 +24,12 @@
<groupId>com.example.cloud.functions</groupId>
<artifactId>functions-firebase-firestore</artifactId>

<!-- [END functions_example_pom] -->
<parent>
<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.0.17</version>
</parent>

<!-- [START functions_example_pom] -->
<properties>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
Expand All @@ -53,7 +50,6 @@
<version>1.0.1</version>
<scope>provided</scope>
</dependency>
<!-- [END functions_example_pom] -->

<!-- The following dependencies are only required for testing -->
<dependency>
Expand All @@ -75,8 +71,6 @@
<scope>test</scope>
</dependency>
</dependencies>

<!-- [START functions_example_pom] -->

<!-- Disable tests during GCF builds (from parent POM) -->
<!-- You can remove this profile to run tests -->
Expand Down Expand Up @@ -158,4 +152,3 @@
</plugins>
</build>
</project>
<!-- [END functions_example_pom] -->
10 changes: 10 additions & 0 deletions functions/helloworld/helloworld/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,27 @@
limitations under the License.
-->

<!-- [START functions_example_pom] -->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.example.cloud.functions</groupId>
<artifactId>functions-hello-world</artifactId>
<!-- [END functions_example_pom] -->

<parent>
<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.0.17</version>
</parent>

<!-- [START functions_example_pom] -->
<properties>
<!-- [END functions_example_pom] -->
<powermock.version>2.0.7</powermock.version>
<!-- [START functions_example_pom] -->
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is usually not required, can we remove this from the tag too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #2851

Expand All @@ -45,6 +50,7 @@
<version>1.0.1</version>
<scope>provided</scope>
</dependency>
<!-- [END functions_example_pom] -->

<!-- The following dependencies are only required for testing -->
<dependency>
Expand Down Expand Up @@ -97,6 +103,7 @@
</profile>
</profiles>

<!-- [START functions_example_pom] -->
<build>
<plugins>
<plugin>
Expand All @@ -116,6 +123,7 @@
<functionTarget>functions.HelloWorld</functionTarget>
</configuration>
</plugin>
<!-- [END functions_example_pom] -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand All @@ -131,6 +139,8 @@
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
<!-- [START functions_example_pom] -->
</plugins>
</build>
</project>
<!-- [END functions_example_pom] -->