Skip to content

Commit 3605324

Browse files
lesvlesv
authored
Update to latest repo-tools (GoogleCloudPlatform#774)
* Update to latest repo-tools 1. check style is no longer stops us, but there are a bunch of failures we should fix. 2. Broke out compute & flex pom.xml’s so that they exist. 3. Make more project include the parent pom. * fix a few things... Still broken are: appengine-guestbook-cloud-datastore-j8 iap-samples cloud-logging-samples vision-landmark-detection
1 parent f99f1e6 commit 3605324

File tree

34 files changed

+182
-119
lines changed

34 files changed

+182
-119
lines changed

‎appengine-java8/firebase-tictactoe/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<version>1.0-SNAPSHOT</version>
2020
<groupId>com.example.appengine</groupId>
2121
<artifactId>appengine-firebase-tictactoe-j8</artifactId>
22+
2223
<parent>
2324
<groupId>com.google.cloud</groupId>
2425
<artifactId>appengine-java8-samples</artifactId>

‎appengine-java8/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/MoveServletTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.junit.After;
4141
import org.junit.Before;
4242
import org.junit.BeforeClass;
43+
import org.junit.Ignore;
4344
import org.junit.Test;
4445
import org.junit.runner.RunWith;
4546
import org.junit.runners.JUnit4;
@@ -147,6 +148,7 @@ public LowLevelHttpResponse execute() throws IOException {
147148
eq("PATCH"), Matchers.matches(FIREBASE_DB_URL + "/channels/[\\w-]+.json$"));
148149
}
149150

151+
@Ignore // TODO: this wasn't running, and I've turned it off.
150152
public void doPost_notMyTurn_move() throws Exception {
151153
// Insert a game
152154
Objectify ofy = ObjectifyService.ofy();

‎compute/cmdline/pom.xml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,14 @@ limitations under the License.
2222
<!-- Parent POM defines common plugins and properties. -->
2323
<parent>
2424
<groupId>com.google.cloud</groupId>
25-
<artifactId>doc-samples</artifactId>
25+
<artifactId>compute</artifactId>
2626
<version>1.0.0</version>
27-
<relativePath>../..</relativePath>
27+
<relativePath>..</relativePath>
2828
</parent>
2929

3030
<build>
3131
<plugins>
32-
<plugin>
33-
<artifactId>maven-compiler-plugin</artifactId>
34-
<version>3.5.1</version>
35-
<configuration>
36-
<source>1.7</source>
37-
<target>1.7</target>
38-
</configuration>
39-
</plugin>
32+
4033
<plugin>
4134
<groupId>org.codehaus.mojo</groupId>
4235
<artifactId>exec-maven-plugin</artifactId>
@@ -58,6 +51,7 @@ limitations under the License.
5851
</systemProperties>
5952
</configuration>
6053
</plugin>
54+
6155
<plugin>
6256
<groupId>org.codehaus.mojo</groupId>
6357
<artifactId>findbugs-maven-plugin</artifactId>
@@ -73,6 +67,7 @@ limitations under the License.
7367
</execution>
7468
</executions>
7569
</plugin>
70+
7671
</plugins>
7772
<finalName>${project.artifactId}-${project.version}</finalName>
7873
</build>

‎compute/error-reporting/pom.xml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,12 @@
2020
<groupId>com.example.compute</groupId>
2121
<artifactId>compute-error-reporting</artifactId>
2222

23-
<!-- TODO: Use common parent after fixing checkstyle errors.
24-
https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
2523
<parent>
26-
<artifactId>doc-samples</artifactId>
24+
<artifactId>compute</artifactId>
2725
<groupId>com.google.cloud</groupId>
2826
<version>1.0.0</version>
29-
<relativePath>../..</relativePath>
27+
<relativePath>..</relativePath>
3028
</parent>
31-
-->
32-
33-
<properties>
34-
<maven.compiler.target>1.8</maven.compiler.target>
35-
<maven.compiler.source>1.8</maven.compiler.source>
36-
<maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
37-
</properties>
3829

3930
<dependencies>
4031
<!-- [START dependencies] -->
@@ -49,7 +40,7 @@
4940
<plugins>
5041
<plugin>
5142
<artifactId>maven-assembly-plugin</artifactId>
52-
<version>${maven-assembly-plugin-version}</version>
43+
<version>3.0.0</version>
5344
<executions>
5445
<execution>
5546
<phase>package</phase>

‎compute/mailjet/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@
1919
<version>1.0-SNAPSHOT</version>
2020
<groupId>com.example.compute</groupId>
2121
<artifactId>compute-mailjet</artifactId>
22+
2223
<parent>
2324
<groupId>com.google.cloud</groupId>
24-
<artifactId>doc-samples</artifactId>
25+
<artifactId>compute</artifactId>
2526
<version>1.0.0</version>
26-
<relativePath>../..</relativePath>
27+
<relativePath>..</relativePath>
2728
</parent>
2829

2930
<properties>

‎compute/pom.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<!--
2+
Copyright 2017 Google Inc.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<project>
17+
<modelVersion>4.0.0</modelVersion>
18+
<version>1.0.0</version>
19+
20+
<groupId>com.google.cloud</groupId>
21+
<artifactId>compute</artifactId>
22+
<packaging>pom</packaging>
23+
24+
<!-- Parent POM defines common plugins and properties. -->
25+
<parent>
26+
<artifactId>doc-samples</artifactId>
27+
<groupId>com.google.cloud</groupId>
28+
<version>1.0.0</version>
29+
<relativePath>..</relativePath>
30+
</parent>
31+
32+
<modules>
33+
<module>cmdline</module>
34+
<module>error-reporting</module>
35+
<module>mailjet</module>
36+
<module>sendgrid</module>
37+
</modules>
38+
39+
</project>

‎compute/sendgrid/pom.xml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,12 @@
2020
<groupId>com.example.compute</groupId>
2121
<artifactId>compute-sendgrid</artifactId>
2222

23-
<!-- TODO: Use common parent after fixing checkstyle errors.
24-
https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
2523
<parent>
26-
<artifactId>doc-samples</artifactId>
24+
<artifactId>compute</artifactId>
2725
<groupId>com.google.cloud</groupId>
2826
<version>1.0.0</version>
29-
<relativePath>../..</relativePath>
27+
<relativePath>..</relativePath>
3028
</parent>
31-
-->
32-
33-
<properties>
34-
<maven.compiler.target>1.8</maven.compiler.target>
35-
<maven.compiler.source>1.8</maven.compiler.source>
36-
<maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
37-
</properties>
3829

3930
<dependencies>
4031
<!-- [START dependencies] -->
@@ -49,7 +40,7 @@
4940
<plugins>
5041
<plugin>
5142
<artifactId>maven-assembly-plugin</artifactId>
52-
<version>${maven-assembly-plugin-version}</version>
43+
<version>3.0.0</version>
5344
<executions>
5445
<execution>
5546
<phase>package</phase>

‎flexible/analytics/pom.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,13 @@
2121
<artifactId>flexible-analytics</artifactId>
2222

2323
<parent>
24-
<artifactId>doc-samples</artifactId>
24+
<artifactId>appengine-flexible</artifactId>
2525
<groupId>com.google.cloud</groupId>
2626
<version>1.0.0</version>
27-
<relativePath>../..</relativePath>
27+
<relativePath>..</relativePath>
2828
</parent>
2929

3030
<properties>
31-
<maven.compiler.target>1.8</maven.compiler.target>
32-
<maven.compiler.source>1.8</maven.compiler.source>
33-
3431
<appengine.maven.plugin>1.3.1</appengine.maven.plugin>
3532
<jetty>9.4.4.v20170414</jetty>
3633

‎flexible/async-rest/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
<packaging>war</packaging>
2323

2424
<parent>
25-
<artifactId>doc-samples</artifactId>
25+
<artifactId>appengine-flexible</artifactId>
2626
<groupId>com.google.cloud</groupId>
2727
<version>1.0.0</version>
28-
<relativePath>../..</relativePath>
28+
<relativePath>..</relativePath>
2929
</parent>
3030

3131
<properties>

‎flexible/cloudsql/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)