Skip to content
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

Update to latest repo-tools #774

Merged
merged 4 commits into from
Jul 31, 2017
Merged

Update to latest repo-tools #774

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a60b39
Update to latest repo-tools
Jul 28, 2017
5c72419
Merge branch 'master' into new-repo-tools
Jul 28, 2017
8ed3510
Merge branch 'master' into new-repo-tools
Jul 30, 2017
0f07abb
fix a few things...
Jul 31, 2017
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
15 changes: 5 additions & 10 deletions compute/cmdline/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,14 @@ limitations under the License.
<!-- Parent POM defines common plugins and properties. -->
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>doc-samples</artifactId>
<artifactId>compute</artifactId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Expand All @@ -58,6 +51,7 @@ limitations under the License.
</systemProperties>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
Expand All @@ -73,6 +67,7 @@ limitations under the License.
</execution>
</executions>
</plugin>

</plugins>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
Expand Down
15 changes: 3 additions & 12 deletions compute/error-reporting/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,12 @@
<groupId>com.example.compute</groupId>
<artifactId>compute-error-reporting</artifactId>

<!-- TODO: Use common parent after fixing checkstyle errors.
https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
<parent>
<artifactId>doc-samples</artifactId>
<artifactId>compute</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>
-->

<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
</properties>

<dependencies>
<!-- [START dependencies] -->
Expand All @@ -49,7 +40,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin-version}</version>
<version>3.0.0</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
5 changes: 3 additions & 2 deletions compute/mailjet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@
<version>1.0-SNAPSHOT</version>
<groupId>com.example.compute</groupId>
<artifactId>compute-mailjet</artifactId>

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>doc-samples</artifactId>
<artifactId>compute</artifactId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<properties>
Expand Down
39 changes: 39 additions & 0 deletions compute/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<!--
Copyright 2017 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<modelVersion>4.0.0</modelVersion>
<version>1.0.0</version>

<groupId>com.google.cloud</groupId>
<artifactId>compute</artifactId>
<packaging>pom</packaging>

<!-- Parent POM defines common plugins and properties. -->
<parent>
<artifactId>doc-samples</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>..</relativePath>
</parent>

<modules>
<module>cmdline</module>
<module>error-reporting</module>
<module>mailjet</module>
<module>sendgrid</module>
</modules>

</project>
15 changes: 3 additions & 12 deletions compute/sendgrid/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,12 @@
<groupId>com.example.compute</groupId>
<artifactId>compute-sendgrid</artifactId>

<!-- TODO: Use common parent after fixing checkstyle errors.
https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
<parent>
<artifactId>doc-samples</artifactId>
<artifactId>compute</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>
-->

<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
</properties>

<dependencies>
<!-- [START dependencies] -->
Expand All @@ -49,7 +40,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin-version}</version>
<version>3.0.0</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
7 changes: 2 additions & 5 deletions flexible/analytics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,13 @@
<artifactId>flexible-analytics</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-flexible</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>

<appengine.maven.plugin>1.3.1</appengine.maven.plugin>
<jetty>9.4.4.v20170414</jetty>

Expand Down
4 changes: 2 additions & 2 deletions flexible/async-rest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<packaging>war</packaging>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-flexible</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<properties>
Expand Down
2 changes: 0 additions & 2 deletions flexible/cloudsql/.gitignore
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions flexible/cloudsql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<artifactId>flexible-cloudsql</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-flexible</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<!-- [START properties] -->
Expand Down
4 changes: 2 additions & 2 deletions flexible/cloudstorage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<artifactId>flexible-cloudstorage</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-flexible</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions flexible/cron/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<artifactId>managed-vms-cron</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-flexible</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions flexible/datastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<artifactId>flexible-datastore</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-flexible</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions flexible/disk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<artifactId>flexible-disk</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-flexible</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions flexible/endpoints/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
<artifactId>flexible-endpoints</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-flexible</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions flexible/errorreporting/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<artifactId>flexible-error-reporting</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-flexible</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions flexible/extending-runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<artifactId>extendingruntime</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-flexible</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions flexible/helloworld/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<artifactId>flexible-helloworld</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-flexible</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions flexible/mailgun/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<artifactId>mailgun</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-flexible</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions flexible/mailjet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-flexible</artifactId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions flexible/memcache/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<artifactId>memcache</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-flexible</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<properties>
Expand Down
Loading