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.

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

Maven Dependency Cleanup - Appengine Java8 #980

Merged
merged 40 commits into from
Jan 5, 2018
Merged
Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
73df5a7
Updated appenginej8/analytics.
kurtisvg Jan 4, 2018
d6ccceb
Updated appengine-java8/appidentity.
kurtisvg Jan 4, 2018
f708248
Updated appengine-java8/bigtable.
kurtisvg Jan 4, 2018
0354aeb
Updated appengine-java8/cloudsql
kurtisvg Jan 4, 2018
c19d8cf
Updated appengine-java8/datastore
kurtisvg Jan 4, 2018
b9bb4f3
Updated appengine-java8/datastore-indexes
kurtisvg Jan 4, 2018
022eedc
Updated appengine-java8/datastore-indexes-exploding
kurtisvg Jan 4, 2018
77050ed
Updated appengine-java8/datastore-indexes-perfect
kurtisvg Jan 4, 2018
8779b44
Updated appengine-java8/endpoints-v2-backend
kurtisvg Jan 4, 2018
3c52735
Updated appengine-java8/endpoints-v2-guice
kurtisvg Jan 4, 2018
5edc0c3
Updated appengine-java8/endpoints-v2-skeleton
kurtisvg Jan 4, 2018
e68e5cd
Updated appengine-java8/firebase-event-proxy
kurtisvg Jan 4, 2018
8c1dfc1
Updated appengine-java8/firebase-tictactoe
kurtisvg Jan 4, 2018
7ae511e
Updated appengine-java8/gaeinfo
kurtisvg Jan 4, 2018
7a6a75d
Updated appengine-java8/guestbook-cloud-datastore
kurtisvg Jan 4, 2018
6d8618a
Updated appengine-java8/guestbook-objectify
kurtisvg Jan 4, 2018
e2d8d94
Updated appengine-java8/images
kurtisvg Jan 4, 2018
dcc7275
Updated appengine-java8/logs
kurtisvg Jan 4, 2018
303afad
Updated appengine-java8/mailgun
kurtisvg Jan 4, 2018
7d3019b
Updated appengine-java8/mailjet
kurtisvg Jan 4, 2018
2c357da
Updated appengine-java8/memcache
kurtisvg Jan 4, 2018
3a7f28c
Updated appengine-java8/metadata
kurtisvg Jan 4, 2018
faec00f
Updated appengine-java8/multitenacity
kurtisvg Jan 4, 2018
3d1ace6
Updated appengine-java8/oauth2
kurtisvg Jan 4, 2018
dad7e65
Updated appengine-java8/postgres
kurtisvg Jan 4, 2018
8edb2f5
Updated appengine-java8/pubsub
kurtisvg Jan 4, 2018
d378a02
Updated appengine-java8/remote-client
kurtisvg Jan 4, 2018
527ac60
Updated appengine-java8/remote-server
kurtisvg Jan 4, 2018
e709bfe
Updated appengine-java8/requests
kurtisvg Jan 4, 2018
0307e70
Updated appengine-java8/sendgrid
kurtisvg Jan 4, 2018
403fd95
Updated appengine-java8/sendgrid
kurtisvg Jan 4, 2018
5ca8eec
Updated appengine-java8/spanner
kurtisvg Jan 4, 2018
1c0bd2c
Updated appengine-java8/taskqueues-deferred
kurtisvg Jan 4, 2018
a5532ab
Updated appengine-java8/taskqueues-pull
kurtisvg Jan 4, 2018
1c99994
Updated appengine-java8/taskqueues-push
kurtisvg Jan 4, 2018
123fafd
Updated appengine-java8/twilio
kurtisvg Jan 4, 2018
673878b
Updated appengine-java8/urlfetch
kurtisvg Jan 4, 2018
3fab973
Updated appengine-java8/users
kurtisvg Jan 4, 2018
84cee69
Updated appengine-java8
kurtisvg Jan 4, 2018
64557df
Merge branch 'master' into mvn-cleanup
lesv Jan 4, 2018
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
3 changes: 3 additions & 0 deletions appengine-java8/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Google App Engine Standard Environment Samples for Java 8

<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">
<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>

This is a repository that contains Java code samples for [Google App Engine
standard environment][ae-docs].

Expand Down
16 changes: 9 additions & 7 deletions appengine-java8/analytics/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@
<groupId>com.example.appengine</groupId>
<artifactId>appengine-analytics-j8</artifactId>

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

<properties>
<maven.compiler.target>1.8</maven.compiler.target>
Expand All @@ -39,7 +41,7 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>${appengine.sdk.version}</version>
<version>1.9.59</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -72,7 +74,7 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<version>${appengine.sdk.version}</version>
<version>1.9.59</version>
<scope>test</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
/*
* Copyright 2015 Google Inc.
*
* <p>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
* 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
*
* <p>http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* <p>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
* 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.
*/

Expand Down
4 changes: 4 additions & 0 deletions appengine-java8/appidentity/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# App Identity sample for Google App Engine

<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">
<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>


This sample demonstrates how to use the [App Identity API][appid] on [Google App
Engine][ae-docs].

Expand Down
20 changes: 11 additions & 9 deletions appengine-java8/appidentity/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,26 @@
<groupId>com.example.appengine</groupId>
<artifactId>appengine-appidentity-j8</artifactId>

<!--
The parent pom defines common style checks and testing strategies for our samples.
Removing or replacing it should not effect the execution of the samples in anyway.
-->
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>appengine-java8-samples</artifactId>
<version>1.0.0</version>
<relativePath>..</relativePath>
<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.0.8</version>
</parent>

<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<appengine.sdk.version>1.9.60</appengine.sdk.version>
</properties>

<dependencies>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>${appengine.sdk.version}</version>
<version>1.9.59</version>
</dependency>

<dependency>
Expand All @@ -64,13 +66,13 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<version>${appengine.sdk.version}</version>
<version>1.9.59</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId>
<version>${appengine.sdk.version}</version>
<version>1.9.59</version>
<scope>test</scope>
</dependency>

Expand All @@ -89,7 +91,7 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<version>${appengine.sdk.version}</version>
<version>1.9.59</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 3 additions & 0 deletions appengine-java8/bigtable/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
Bigtable-hello-j8
=================

<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">
<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>

Moves the Bigtable Hello World application to Google App Engine Standard for Java 8.


Expand Down
24 changes: 9 additions & 15 deletions appengine-java8/bigtable/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,35 +23,30 @@ limitations under the License.
<groupId>com.example.google.cloud.bigtable</groupId>
<artifactId>bigtable-hello-j8</artifactId>

<!--
The parent pom defines common style checks and testing strategies for our samples.
Removing or replacing it should not effect the execution of the samples in anyway.
-->
<parent>
<artifactId>appengine-java8-samples</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>..</relativePath>
<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.0.8</version>
</parent>

<properties>
<appengine.maven.plugin>1.3.2</appengine.maven.plugin>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

<bigtable.version>1.0.0-pre3</bigtable.version>
<hbase.version>1.2.6</hbase.version>
<bigtable.projectID>YOUR_PROJECT_ID</bigtable.projectID>
<bigtable.instanceID>YOUR_INSTANCE_ID</bigtable.instanceID>

<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<archiveClasses>true</archiveClasses>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>

<dependencies>
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x</artifactId>
<version>${bigtable.version}</version>
<version>1.0.0-pre3</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -162,7 +157,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>${appengine.maven.plugin}</version>
<version>1.3.2</version>
<configuration>
</configuration>
</plugin>
Expand Down Expand Up @@ -203,5 +198,4 @@ limitations under the License.
</repository>
</repositories>


</project>
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
/*
* Copyright 2016 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
* 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
* 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.
* 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.
*/


package com.example.bigtable;

import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
/*
* Copyright 2015 Google Inc.
* Copyright 2016 Google Inc.
*
* <p>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
* 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
*
* <p>http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* <p>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
* 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.
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
/*
* Copyright 2016 Google Inc.
*
* <p>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
* 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
*
* <p>http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* <p>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
* 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.
*/

Expand Down
4 changes: 4 additions & 0 deletions appengine-java8/cloudsql/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Cloud SQL sample for Google App Engine

<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/cloudsql/README.md">
<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>


This sample demonstrates how to use [Cloud SQL](https://cloud.google.com/cloudsql/) on Google App
Engine standard Java 8

Expand Down
11 changes: 7 additions & 4 deletions appengine-java8/cloudsql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@
<groupId>com.example.appengine</groupId>
<artifactId>appengine-cloudsql-j8</artifactId>

<!--
The parent pom defines common style checks and testing strategies for our samples.
Removing or replacing it should not effect the execution of the samples in anyway.
-->
<parent>
<artifactId>appengine-java8-samples</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>..</relativePath>
<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.0.8</version>
</parent>

<!-- [START properties] -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright 2016 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
24 changes: 16 additions & 8 deletions appengine-java8/datastore-indexes-exploding/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,26 @@
<groupId>com.example.appengine</groupId>
<artifactId>appengine-datastore-indexes-exploding-j8</artifactId>

<!--
The parent pom defines common style checks and testing strategies for our samples.
Removing or replacing it should not effect the execution of the samples in anyway.
-->
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>appengine-java8-samples</artifactId>
<version>1.0.0</version>
<relativePath>..</relativePath>
<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.0.8</version>
</parent>

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

<dependencies>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>${appengine.sdk.version}</version>
<version>1.9.59</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand All @@ -57,19 +65,19 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<version>${appengine.sdk.version}</version>
<version>1.9.59</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<version>${appengine.sdk.version}</version>
<version>1.9.59</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId>
<version>${appengine.sdk.version}</version>
<version>1.9.59</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading