Maven Dependency Cleanup - Appengine Java8

appengine-java8/README.md

@@ -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].
 

appengine-java8/analytics/pom.xml

@@ -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>
@@ -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>
@@ -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>
 

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

@@ -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.
  */
 

appengine-java8/appidentity/README.md

@@ -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].
 

appengine-java8/appidentity/pom.xml

@@ -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>
@@ -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>
 
@@ -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>

appengine-java8/bigtable/README.md

@@ -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.
 
 

appengine-java8/bigtable/pom.xml

@@ -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>
@@ -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>
@@ -203,5 +198,4 @@ limitations under the License.
  </repository>
  </repositories>
 
-
 </project>

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

@@ -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;

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

@@ -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.
  */
 

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

@@ -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.
  */
 

appengine-java8/cloudsql/README.md

@@ -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
 

appengine-java8/cloudsql/pom.xml

@@ -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] -->

appengine-java8/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

appengine-java8/datastore-indexes-exploding/pom.xml

@@ -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>
@@ -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>