Skip to content

Commit 7f5772f

Browse files
authored
Maven Dependency Cleanup - Appengine (#969)
* Cleaned appengine/analytics. * Cleaned appengeine/appidenity * Removed 'channel' samples - (service disabled) * Cleaned up appengine/cloudsql. * Cleaned appengine/datastore. * Cleaned appengine/endpoints-frameworks-v2/backend * Cleaned appengine/endpoints-frameworks-v2/guice * Cleaned appengine/endpoints-frameworks-v2/migration-example * Cleaned appengine/endpoints-v1-helloworld. * Cleaned firebase-event-proxy. * Updated Appengine/Firebase. * Cleaned appengine/gaeinfo. * Cleaned appengine/guestbook-cloud-datastore. * Cleaned appengine/appengine-guestbook-objectify. * Cleaned appengine/helloworld. * Cleaned appengine/helloworld-new-plugins. * Cleaned appengine/iap. * Cleaned appengine/images. * Cleaned appengine/logs. * Cleaned appengine/mail. * Cleaned appengine/mailgun. * Cleaned appengine/mailjet * Cleaned appengine/memchache * Cleaned appengine/multitenancy * Cleaned appengine/oauth2 * Cleaned appengine/push-chat * Cleaned appengine/remote * Cleaned appengine/requests * Cleaned appengine/search * Cleaned appengine/sendgrid * Cleaned appengine/sockets * Cleaned appengine/static-files * Cleaned appengine/taskqueue * Cleaned appengine/twilio * Cleaned appengine/urlfetch * Cleaned appengine/users * Cleaned root pom and other minor fixes. * Updated to 1.0.8
1 parent c74749b commit 7f5772f

File tree

241 files changed

+1592
-2383
lines changed

Some content is hidden

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

241 files changed

+1592
-2383
lines changed

appengine/README.md

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
December 13, 2017 and will be shut down entirely on January 16, 2019. It is replaced by the
55
[Java 8 Runtime Environment](https://cloud.google.com/appengine/docs/standard/java/runtime-java8).**
66

7+
<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine/README.md">
8+
<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
9+
10+
711
Samples for the Java 8 runtime can be found [here](/appengine-java8).
812

913

appengine/analytics/pom.xml

+9-7
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@
2020
<groupId>com.example.appengine</groupId>
2121
<artifactId>appengine-analytics</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-doc-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.7</maven.compiler.target>
@@ -37,6 +39,7 @@
3739
<dependency>
3840
<groupId>com.google.appengine</groupId>
3941
<artifactId>appengine-api-1.0-sdk</artifactId>
42+
<version>1.9.59</version>
4043
</dependency>
4144
<dependency>
4245
<groupId>org.apache.httpcomponents</groupId>
@@ -55,11 +58,10 @@
5558
<!-- for hot reload of the web application -->
5659
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
5760
<plugins>
58-
<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
5961
<plugin>
6062
<groupId>com.google.appengine</groupId>
6163
<artifactId>appengine-maven-plugin</artifactId>
62-
<version>${appengine.sdk.version}</version>
64+
<version>1.9.59</version>
6365
</plugin>
6466
</plugins>
6567
</build>

appengine/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2015 Google Inc.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,18 +18,15 @@
1818

1919
import com.google.appengine.api.urlfetch.URLFetchService;
2020
import com.google.appengine.api.urlfetch.URLFetchServiceFactory;
21-
22-
import org.apache.http.client.utils.URIBuilder;
23-
2421
import java.io.IOException;
2522
import java.net.URI;
2623
import java.net.URISyntaxException;
2724
import java.net.URL;
28-
2925
import javax.servlet.ServletException;
3026
import javax.servlet.http.HttpServlet;
3127
import javax.servlet.http.HttpServletRequest;
3228
import javax.servlet.http.HttpServletResponse;
29+
import org.apache.http.client.utils.URIBuilder;
3330

3431
// [START example]
3532
@SuppressWarnings("serial")

appengine/appidentity/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ Samples for the Java 8 runtime can be found [here](/appengine-java8).
99
This sample demonstrates how to use the [App Identity API][appid] on [Google App
1010
Engine][ae-docs].
1111

12+
<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine/appidentity/README.md">
13+
<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
14+
1215
[appid]: https://cloud.google.com/appengine/docs/java/appidentity/
1316
[ae-docs]: https://cloud.google.com/appengine/docs/java/
1417

appengine/appidentity/pom.xml

+13-9
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,26 @@
2020
<groupId>com.example.appengine</groupId>
2121
<artifactId>appengine-appidentity</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-doc-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>
31-
<appengine.sdk.version>1.9.60</appengine.sdk.version>
34+
<maven.compiler.target>1.7</maven.compiler.target>
35+
<maven.compiler.source>1.7</maven.compiler.source>
3236
</properties>
3337

3438
<dependencies>
3539
<dependency>
3640
<groupId>com.google.appengine</groupId>
3741
<artifactId>appengine-api-1.0-sdk</artifactId>
38-
<version>${appengine.sdk.version}</version>
42+
<version>1.9.59</version>
3943
</dependency>
4044
<dependency>
4145
<groupId>com.google.guava</groupId>
@@ -71,19 +75,19 @@
7175
<dependency>
7276
<groupId>com.google.appengine</groupId>
7377
<artifactId>appengine-testing</artifactId>
74-
<version>${appengine.sdk.version}</version>
78+
<version>1.9.59</version>
7579
<scope>test</scope>
7680
</dependency>
7781
<dependency>
7882
<groupId>com.google.appengine</groupId>
7983
<artifactId>appengine-api-stubs</artifactId>
80-
<version>${appengine.sdk.version}</version>
84+
<version>1.9.59</version>
8185
<scope>test</scope>
8286
</dependency>
8387
<dependency>
8488
<groupId>com.google.appengine</groupId>
8589
<artifactId>appengine-tools-sdk</artifactId>
86-
<version>${appengine.sdk.version}</version>
90+
<version>1.9.59</version>
8791
<scope>test</scope>
8892
</dependency>
8993
<dependency>

appengine/appidentity/src/main/java/com/example/appengine/appidentity/IdentityServlet.java

-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
package com.example.appengine.appidentity;
1818

1919
import com.google.apphosting.api.ApiProxy;
20-
2120
import java.io.IOException;
22-
2321
import javax.servlet.http.HttpServlet;
2422
import javax.servlet.http.HttpServletRequest;
2523
import javax.servlet.http.HttpServletResponse;

appengine/appidentity/src/main/java/com/example/appengine/appidentity/SignForAppServlet.java

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.google.appengine.api.appidentity.AppIdentityService;
2020
import com.google.appengine.api.appidentity.AppIdentityServiceFactory;
2121
import com.google.appengine.api.appidentity.PublicCertificate;
22-
2322
import java.io.ByteArrayInputStream;
2423
import java.io.IOException;
2524
import java.io.InputStream;
@@ -34,7 +33,6 @@
3433
import java.security.cert.CertificateFactory;
3534
import java.util.Arrays;
3635
import java.util.Collection;
37-
3836
import javax.servlet.http.HttpServlet;
3937
import javax.servlet.http.HttpServletRequest;
4038
import javax.servlet.http.HttpServletResponse;

appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,15 @@
1919
import com.google.appengine.api.appidentity.AppIdentityService;
2020
import com.google.appengine.api.appidentity.AppIdentityServiceFactory;
2121
import com.google.common.io.CharStreams;
22-
23-
import org.json.JSONObject;
24-
import org.json.JSONTokener;
25-
2622
import java.io.InputStream;
2723
import java.io.InputStreamReader;
2824
import java.io.OutputStreamWriter;
2925
import java.net.HttpURLConnection;
3026
import java.net.URL;
3127
import java.nio.charset.StandardCharsets;
3228
import java.util.ArrayList;
29+
import org.json.JSONObject;
30+
import org.json.JSONTokener;
3331

3432
@SuppressWarnings("serial")
3533
class UrlShortener {

appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import java.io.IOException;
2020
import java.io.PrintWriter;
21-
2221
import javax.servlet.http.HttpServlet;
2322
import javax.servlet.http.HttpServletRequest;
2423
import javax.servlet.http.HttpServletResponse;

appengine/appidentity/src/test/java/com/example/appengine/appidentity/IdentityServletTest.java

+4-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
import static org.mockito.Mockito.when;
2121

2222
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
23-
23+
import java.io.PrintWriter;
24+
import java.io.StringWriter;
25+
import javax.servlet.http.HttpServletRequest;
26+
import javax.servlet.http.HttpServletResponse;
2427
import org.junit.After;
2528
import org.junit.Before;
2629
import org.junit.Test;
@@ -29,12 +32,6 @@
2932
import org.mockito.Mock;
3033
import org.mockito.MockitoAnnotations;
3134

32-
import java.io.PrintWriter;
33-
import java.io.StringWriter;
34-
35-
import javax.servlet.http.HttpServletRequest;
36-
import javax.servlet.http.HttpServletResponse;
37-
3835
/**
3936
* Unit tests for {@link IdentityServlet}.
4037
*/

appengine/appidentity/src/test/java/com/example/appengine/appidentity/SignForAppServletTest.java

+4-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
import static org.mockito.Mockito.when;
2121

2222
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
23-
23+
import java.io.PrintWriter;
24+
import java.io.StringWriter;
25+
import javax.servlet.http.HttpServletRequest;
26+
import javax.servlet.http.HttpServletResponse;
2427
import org.junit.After;
2528
import org.junit.Before;
2629
import org.junit.Test;
@@ -29,12 +32,6 @@
2932
import org.mockito.Mock;
3033
import org.mockito.MockitoAnnotations;
3134

32-
import java.io.PrintWriter;
33-
import java.io.StringWriter;
34-
35-
import javax.servlet.http.HttpServletRequest;
36-
import javax.servlet.http.HttpServletResponse;
37-
3835
/**
3936
* Unit tests for {@link SignForAppServlet}.
4037
*/

appengine/channel/README.md

-5
This file was deleted.

appengine/channel/pom.xml

-108
This file was deleted.

0 commit comments

Comments
 (0)