Maven Dependency Cleanup - Appengine

appengine/README.md

@@ -4,6 +4,10 @@
 December 13, 2017 and will be shut down entirely on January 16, 2019. It is replaced by the
 [Java 8 Runtime Environment](https://cloud.google.com/appengine/docs/standard/java/runtime-java8).**
 
+<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">
+<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
+
+
 Samples for the Java 8 runtime can be found [here](/appengine-java8).
 
 

appengine/analytics/pom.xml

@@ -20,13 +20,15 @@
   <groupId>com.example.appengine</groupId>
   <artifactId>appengine-analytics</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-doc-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.7</maven.compiler.target>
@@ -37,6 +39,7 @@
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
+      <version>1.9.59</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
@@ -55,11 +58,10 @@
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     <plugins>
-      <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>${appengine.sdk.version}</version>
+        <version>1.9.59</version>
       </plugin>
     </plugins>
   </build>

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

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,18 +18,15 @@
 
 import com.google.appengine.api.urlfetch.URLFetchService;
 import com.google.appengine.api.urlfetch.URLFetchServiceFactory;
-
-import org.apache.http.client.utils.URIBuilder;
-
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.http.client.utils.URIBuilder;
 
 // [START example]
 @SuppressWarnings("serial")

appengine/appidentity/README.md

@@ -9,6 +9,9 @@ Samples for the Java 8 runtime can be found [here](/appengine-java8).
 This sample demonstrates how to use the [App Identity API][appid] on [Google App
 Engine][ae-docs].
 
+<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">
+<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
+
 [appid]: https://cloud.google.com/appengine/docs/java/appidentity/
 [ae-docs]: https://cloud.google.com/appengine/docs/java/
 

appengine/appidentity/pom.xml

@@ -20,22 +20,26 @@
   <groupId>com.example.appengine</groupId>
   <artifactId>appengine-appidentity</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-doc-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>
-    <appengine.sdk.version>1.9.60</appengine.sdk.version>
+    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.7</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>com.google.guava</groupId>
@@ -71,19 +75,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>

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

@@ -17,9 +17,7 @@
 package com.example.appengine.appidentity;
 
 import com.google.apphosting.api.ApiProxy;
-
 import java.io.IOException;
-
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

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

@@ -19,7 +19,6 @@
 import com.google.appengine.api.appidentity.AppIdentityService;
 import com.google.appengine.api.appidentity.AppIdentityServiceFactory;
 import com.google.appengine.api.appidentity.PublicCertificate;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,7 +33,6 @@
 import java.security.cert.CertificateFactory;
 import java.util.Arrays;
 import java.util.Collection;
-
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

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

@@ -19,17 +19,15 @@
 import com.google.appengine.api.appidentity.AppIdentityService;
 import com.google.appengine.api.appidentity.AppIdentityServiceFactory;
 import com.google.common.io.CharStreams;
-
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import org.json.JSONObject;
+import org.json.JSONTokener;
 
 @SuppressWarnings("serial")
 class UrlShortener {

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

@@ -18,7 +18,6 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
-
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

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

@@ -20,7 +20,10 @@
 import static org.mockito.Mockito.when;
 
 import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -29,12 +32,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * Unit tests for {@link IdentityServlet}.
  */

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

@@ -20,7 +20,10 @@
 import static org.mockito.Mockito.when;
 
 import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -29,12 +32,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * Unit tests for {@link SignForAppServlet}.
  */