Skip to content

Commit cb201d9

Browse files
kurtisvgkurtisvg
authored
Maven Dependency Cleanup - Appengine Java8 (GoogleCloudPlatform#980)
* Updated appenginej8/analytics. * Updated appengine-java8/appidentity. * Updated appengine-java8/bigtable. * Updated appengine-java8/cloudsql * Updated appengine-java8/datastore * Updated appengine-java8/datastore-indexes * Updated appengine-java8/datastore-indexes-exploding * Updated appengine-java8/datastore-indexes-perfect * Updated appengine-java8/endpoints-v2-backend * Updated appengine-java8/endpoints-v2-guice * Updated appengine-java8/endpoints-v2-skeleton * Updated appengine-java8/firebase-event-proxy * Updated appengine-java8/firebase-tictactoe * Updated appengine-java8/gaeinfo * Updated appengine-java8/guestbook-cloud-datastore * Updated appengine-java8/guestbook-objectify * Updated appengine-java8/images * Updated appengine-java8/logs * Updated appengine-java8/mailgun * Updated appengine-java8/mailjet * Updated appengine-java8/memcache * Updated appengine-java8/metadata * Updated appengine-java8/multitenacity * Updated appengine-java8/oauth2 * Updated appengine-java8/postgres * Updated appengine-java8/pubsub * Updated appengine-java8/remote-client * Updated appengine-java8/remote-server * Updated appengine-java8/requests * Updated appengine-java8/sendgrid * Updated appengine-java8/sendgrid * Updated appengine-java8/spanner * Updated appengine-java8/taskqueues-deferred * Updated appengine-java8/taskqueues-pull * Updated appengine-java8/taskqueues-push * Updated appengine-java8/twilio * Updated appengine-java8/urlfetch * Updated appengine-java8/users * Updated appengine-java8
1 parent ed6d548 commit cb201d9

File tree

160 files changed

+1275
-821
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+1275
-821
lines changed

‎appengine-java8/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Google App Engine Standard Environment Samples for Java 8
22

3+
<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java8/README.md">
4+
<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
5+
36
This is a repository that contains Java code samples for [Google App Engine
47
standard environment][ae-docs].
58

‎appengine-java8/analytics/pom.xml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@
2020
<groupId>com.example.appengine</groupId>
2121
<artifactId>appengine-analytics-j8</artifactId>
2222

23+
<!--
24+
The parent pom defines common style checks and testing strategies for our samples.
25+
Removing or replacing it should not effect the execution of the samples in anyway.
26+
-->
2327
<parent>
24-
<artifactId>appengine-java8-samples</artifactId>
25-
<groupId>com.google.cloud</groupId>
26-
<version>1.0.0</version>
27-
<relativePath>..</relativePath>
28+
<groupId>com.google.cloud.samples</groupId>
29+
<artifactId>shared-configuration</artifactId>
30+
<version>1.0.8</version>
2831
</parent>
29-
<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
3032

3133
<properties>
3234
<maven.compiler.target>1.8</maven.compiler.target>
@@ -39,7 +41,7 @@
3941
<dependency>
4042
<groupId>com.google.appengine</groupId>
4143
<artifactId>appengine-api-1.0-sdk</artifactId>
42-
<version>${appengine.sdk.version}</version>
44+
<version>1.9.59</version>
4345
</dependency>
4446

4547
<dependency>
@@ -72,7 +74,7 @@
7274
<dependency>
7375
<groupId>com.google.appengine</groupId>
7476
<artifactId>appengine-api-stubs</artifactId>
75-
<version>${appengine.sdk.version}</version>
77+
<version>1.9.59</version>
7678
<scope>test</scope>
7779
</dependency>
7880

‎appengine-java8/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
/*
22
* Copyright 2015 Google Inc.
33
*
4-
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
5-
* except in compliance with the License. You may obtain a copy of the License at
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
67
*
7-
* <p>http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
89
*
9-
* <p>Unless required by applicable law or agreed to in writing, software distributed under the
10-
* License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
11-
* express or implied. See the License for the specific language governing permissions and
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
1214
* limitations under the License.
1315
*/
1416

‎appengine-java8/appidentity/README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# App Identity sample for Google App Engine
22

3+
<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java8/appidentity/README.md">
4+
<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
5+
6+
37
This sample demonstrates how to use the [App Identity API][appid] on [Google App
48
Engine][ae-docs].
59

‎appengine-java8/appidentity/pom.xml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,26 @@
2020
<groupId>com.example.appengine</groupId>
2121
<artifactId>appengine-appidentity-j8</artifactId>
2222

23+
<!--
24+
The parent pom defines common style checks and testing strategies for our samples.
25+
Removing or replacing it should not effect the execution of the samples in anyway.
26+
-->
2327
<parent>
24-
<groupId>com.google.cloud</groupId>
25-
<artifactId>appengine-java8-samples</artifactId>
26-
<version>1.0.0</version>
27-
<relativePath>..</relativePath>
28+
<groupId>com.google.cloud.samples</groupId>
29+
<artifactId>shared-configuration</artifactId>
30+
<version>1.0.8</version>
2831
</parent>
2932

3033
<properties>
3134
<maven.compiler.target>1.8</maven.compiler.target>
3235
<maven.compiler.source>1.8</maven.compiler.source>
33-
<appengine.sdk.version>1.9.60</appengine.sdk.version>
3436
</properties>
3537

3638
<dependencies>
3739
<dependency>
3840
<groupId>com.google.appengine</groupId>
3941
<artifactId>appengine-api-1.0-sdk</artifactId>
40-
<version>${appengine.sdk.version}</version>
42+
<version>1.9.59</version>
4143
</dependency>
4244

4345
<dependency>
@@ -64,13 +66,13 @@
6466
<dependency>
6567
<groupId>com.google.appengine</groupId>
6668
<artifactId>appengine-api-stubs</artifactId>
67-
<version>${appengine.sdk.version}</version>
69+
<version>1.9.59</version>
6870
<scope>test</scope>
6971
</dependency>
7072
<dependency>
7173
<groupId>com.google.appengine</groupId>
7274
<artifactId>appengine-tools-sdk</artifactId>
73-
<version>${appengine.sdk.version}</version>
75+
<version>1.9.59</version>
7476
<scope>test</scope>
7577
</dependency>
7678

@@ -89,7 +91,7 @@
8991
<dependency>
9092
<groupId>com.google.appengine</groupId>
9193
<artifactId>appengine-testing</artifactId>
92-
<version>${appengine.sdk.version}</version>
94+
<version>1.9.59</version>
9395
<scope>test</scope>
9496
</dependency>
9597
<dependency>

‎appengine-java8/bigtable/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Bigtable-hello-j8
22
=================
33

4+
<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java8/bigtable/README.md">
5+
<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
6+
47
Moves the Bigtable Hello World application to Google App Engine Standard for Java 8.
58

69

‎appengine-java8/bigtable/pom.xml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,30 @@ limitations under the License.
2323
<groupId>com.example.google.cloud.bigtable</groupId>
2424
<artifactId>bigtable-hello-j8</artifactId>
2525

26+
<!--
27+
The parent pom defines common style checks and testing strategies for our samples.
28+
Removing or replacing it should not effect the execution of the samples in anyway.
29+
-->
2630
<parent>
27-
<artifactId>appengine-java8-samples</artifactId>
28-
<groupId>com.google.cloud</groupId>
29-
<version>1.0.0</version>
30-
<relativePath>..</relativePath>
31+
<groupId>com.google.cloud.samples</groupId>
32+
<artifactId>shared-configuration</artifactId>
33+
<version>1.0.8</version>
3134
</parent>
3235

3336
<properties>
34-
<appengine.maven.plugin>1.3.2</appengine.maven.plugin>
35-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3737
<maven.compiler.source>1.8</maven.compiler.source>
3838
<maven.compiler.target>1.8</maven.compiler.target>
3939

40-
<bigtable.version>1.0.0-pre3</bigtable.version>
41-
<hbase.version>1.2.6</hbase.version>
4240
<bigtable.projectID>YOUR_PROJECT_ID</bigtable.projectID>
4341
<bigtable.instanceID>YOUR_INSTANCE_ID</bigtable.instanceID>
44-
45-
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
46-
<archiveClasses>true</archiveClasses>
4742
<failOnMissingWebXml>false</failOnMissingWebXml>
4843
</properties>
4944

5045
<dependencies>
5146
<dependency>
5247
<groupId>com.google.cloud.bigtable</groupId>
5348
<artifactId>bigtable-hbase-1.x</artifactId>
54-
<version>${bigtable.version}</version>
49+
<version>1.0.0-pre3</version>
5550
</dependency>
5651

5752
<dependency>
@@ -162,7 +157,7 @@ limitations under the License.
162157
<plugin>
163158
<groupId>com.google.cloud.tools</groupId>
164159
<artifactId>appengine-maven-plugin</artifactId>
165-
<version>${appengine.maven.plugin}</version>
160+
<version>1.3.2</version>
166161
<configuration>
167162
</configuration>
168163
</plugin>
@@ -203,5 +198,4 @@ limitations under the License.
203198
</repository>
204199
</repositories>
205200

206-
207201
</project>

‎appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelloWorld.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
/*
22
* Copyright 2016 Google Inc.
33
*
4-
* Licensed under the Apache License, Version 2.0 (the "License"); you
5-
* may not use this file except in compliance with the License. You may
6-
* obtain a copy of the License at
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
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
13-
* implied. See the License for the specific language governing
14-
* permissions and limitations under the License.
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.
1515
*/
1616

17+
1718
package com.example.bigtable;
1819

1920
import java.io.IOException;

‎appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelper.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
/*
2-
* Copyright 2015 Google Inc.
2+
* Copyright 2016 Google Inc.
33
*
4-
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
5-
* except in compliance with the License. You may obtain a copy of the License at
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
67
*
7-
* <p>http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
89
*
9-
* <p>Unless required by applicable law or agreed to in writing, software distributed under the
10-
* License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
11-
* express or implied. See the License for the specific language governing permissions and
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
1214
* limitations under the License.
1315
*/
1416

‎appengine-java8/bigtable/src/test/java/com/example/bigtable/ITBigtableHelloWorld.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
/*
22
* Copyright 2016 Google Inc.
33
*
4-
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
5-
* except in compliance with the License. You may obtain a copy of the License at
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
67
*
7-
* <p>http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
89
*
9-
* <p>Unless required by applicable law or agreed to in writing, software distributed under the
10-
* License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
11-
* express or implied. See the License for the specific language governing permissions and
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
1214
* limitations under the License.
1315
*/
1416

0 commit comments

Comments
 (0)