diff --git a/cloud-sql/mysql/servlet/README.md b/cloud-sql/mysql/servlet/README.md
index 163d75b1cb7..026a10ae974 100644
--- a/cloud-sql/mysql/servlet/README.md
+++ b/cloud-sql/mysql/servlet/README.md
@@ -62,7 +62,7 @@ environment variables into the runtime.
 
 Next, the following command will deploy the application to your Google Cloud project:
 ```bash
-mvn appengine:deploy
+mvn clean package appengine:deploy
 ```
 
 ### Deploy to Cloud Run
diff --git a/cloud-sql/mysql/servlet/pom.xml b/cloud-sql/mysql/servlet/pom.xml
index e3f6b708659..f6181b29c38 100644
--- a/cloud-sql/mysql/servlet/pom.xml
+++ b/cloud-sql/mysql/servlet/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
   </parent>
 
   <properties>
diff --git a/cloud-sql/postgres/servlet/README.md b/cloud-sql/postgres/servlet/README.md
index ed7db785dac..1a4c47d02a5 100644
--- a/cloud-sql/postgres/servlet/README.md
+++ b/cloud-sql/postgres/servlet/README.md
@@ -62,5 +62,5 @@ environment variables into the runtime.
 
 Next, the following command will deploy the application to your Google Cloud project:
 ```bash
-mvn appengine:deploy
+mvn clean package appengine:deploy
 ```
diff --git a/cloud-sql/postgres/servlet/pom.xml b/cloud-sql/postgres/servlet/pom.xml
index 68ca76f7a0d..606d230bcbe 100644
--- a/cloud-sql/postgres/servlet/pom.xml
+++ b/cloud-sql/postgres/servlet/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
   </parent>
 
   <properties>
diff --git a/memorystore/redis/pom.xml b/memorystore/redis/pom.xml
index b242c9aed96..e700ba320a6 100644
--- a/memorystore/redis/pom.xml
+++ b/memorystore/redis/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
   </parent>
 
   <properties>
diff --git a/storage/cloud-client/pom.xml b/storage/cloud-client/pom.xml
index 7cc50f03ab6..5320f73b981 100644
--- a/storage/cloud-client/pom.xml
+++ b/storage/cloud-client/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
   </parent>
 
   <properties>
diff --git a/storage/json-api/pom.xml b/storage/json-api/pom.xml
index 4f56cda0b34..80978bf5485 100644
--- a/storage/json-api/pom.xml
+++ b/storage/json-api/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
   </parent>
 
   <properties>
diff --git a/storage/s3-sdk/pom.xml b/storage/s3-sdk/pom.xml
index 2f1a83450ac..ce533f16e55 100644
--- a/storage/s3-sdk/pom.xml
+++ b/storage/s3-sdk/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
   </parent>
 
   <properties>
diff --git a/storage/s3-sdk/src/main/java/ListGcsBuckets.java b/storage/s3-sdk/src/main/java/ListGcsBuckets.java
index f31ee2126c3..14c0cff8f3a 100644
--- a/storage/s3-sdk/src/main/java/ListGcsBuckets.java
+++ b/storage/s3-sdk/src/main/java/ListGcsBuckets.java
@@ -21,24 +21,23 @@
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.Bucket;
-
 import java.util.List;
 
 public class ListGcsBuckets {
-  public static void listGcsBuckets(String googleAccessKeyId,
-      String googleAccessKeySecret) {
+  public static void listGcsBuckets(String googleAccessKeyId, String googleAccessKeySecret) {
 
     // String googleAccessKeyId = "your-google-access-key-id";
     // String googleAccessKeySecret = "your-google-access-key-secret";
 
     // Create a BasicAWSCredentials using Cloud Storage HMAC credentials.
-    BasicAWSCredentials googleCreds = new BasicAWSCredentials(googleAccessKeyId,
-        googleAccessKeySecret);
+    BasicAWSCredentials googleCreds =
+        new BasicAWSCredentials(googleAccessKeyId, googleAccessKeySecret);
 
     // Create a new client and do the following:
     // 1. Change the endpoint URL to use the Google Cloud Storage XML API endpoint.
     // 2. Use Cloud Storage HMAC Credentials.
-    AmazonS3 interopClient = AmazonS3ClientBuilder.standard()
+    AmazonS3 interopClient =
+        AmazonS3ClientBuilder.standard()
             .withEndpointConfiguration(
                 new AwsClientBuilder.EndpointConfiguration(
                     "https://storage.googleapis.com", "auto"))
@@ -59,4 +58,3 @@ public static void listGcsBuckets(String googleAccessKeyId,
   }
   // [END storage_s3_sdk_list_buckets]
 }
-
diff --git a/storage/s3-sdk/src/main/java/ListGcsObjects.java b/storage/s3-sdk/src/main/java/ListGcsObjects.java
index e50ce02c01b..85e47dd32fd 100644
--- a/storage/s3-sdk/src/main/java/ListGcsObjects.java
+++ b/storage/s3-sdk/src/main/java/ListGcsObjects.java
@@ -14,35 +14,32 @@
  * limitations under the License.
  */
 
-
 // [START storage_s3_sdk_list_objects]
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
-
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 
-import java.util.List;
-
 public class ListGcsObjects {
-  public static void listGcsObjects(String googleAccessKeyId,
-      String googleAccessKeySecret, String bucketName) {
+  public static void listGcsObjects(
+      String googleAccessKeyId, String googleAccessKeySecret, String bucketName) {
 
     // String googleAccessKeyId = "your-google-access-key-id";
     // String googleAccessKeySecret = "your-google-access-key-secret";
     // String bucketName = "bucket-name";
 
     // Create a BasicAWSCredentials using Cloud Storage HMAC credentials.
-    BasicAWSCredentials googleCreds = new BasicAWSCredentials(googleAccessKeyId,
-        googleAccessKeySecret);
+    BasicAWSCredentials googleCreds =
+        new BasicAWSCredentials(googleAccessKeyId, googleAccessKeySecret);
 
     // Create a new client and do the following:
     // 1. Change the endpoint URL to use the Google Cloud Storage XML API endpoint.
     // 2. Use Cloud Storage HMAC Credentials.
-    AmazonS3 interopClient = AmazonS3ClientBuilder.standard()
+    AmazonS3 interopClient =
+        AmazonS3ClientBuilder.standard()
             .withEndpointConfiguration(
                 new AwsClientBuilder.EndpointConfiguration(
                     "https://storage.googleapis.com", "auto"))
diff --git a/storage/s3-sdk/src/test/java/ListGcsBucketsTest.java b/storage/s3-sdk/src/test/java/ListGcsBucketsTest.java
index d63e2cf4cc4..bad343bb3e1 100644
--- a/storage/s3-sdk/src/test/java/ListGcsBucketsTest.java
+++ b/storage/s3-sdk/src/test/java/ListGcsBucketsTest.java
@@ -18,7 +18,6 @@
 import static org.junit.Assert.assertThat;
 
 import com.amazonaws.services.s3.model.Bucket;
-
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.List;
diff --git a/storage/s3-sdk/src/test/java/ListGcsObjectsTest.java b/storage/s3-sdk/src/test/java/ListGcsObjectsTest.java
index 9c15a9b6d0c..2b77dbc56d9 100644
--- a/storage/s3-sdk/src/test/java/ListGcsObjectsTest.java
+++ b/storage/s3-sdk/src/test/java/ListGcsObjectsTest.java
@@ -19,7 +19,6 @@
 
 import com.amazonaws.services.s3.model.Bucket;
 import com.amazonaws.services.s3.model.ObjectListing;
-
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.List;
diff --git a/storage/storage-transfer/pom.xml b/storage/storage-transfer/pom.xml
index 4fd13ae2865..838cb552f3a 100644
--- a/storage/storage-transfer/pom.xml
+++ b/storage/storage-transfer/pom.xml
@@ -30,7 +30,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
   </parent>
 
   <properties>
diff --git a/storage/xml-api/cmdline-sample/pom.xml b/storage/xml-api/cmdline-sample/pom.xml
index b5bc3d91efc..ee80b67da14 100644
--- a/storage/xml-api/cmdline-sample/pom.xml
+++ b/storage/xml-api/cmdline-sample/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
   </parent>
 
   <properties>
diff --git a/storage/xml-api/cmdline-sample/src/main/java/StorageSample.java b/storage/xml-api/cmdline-sample/src/main/java/StorageSample.java
index b0cd953b729..b0382e5225e 100644
--- a/storage/xml-api/cmdline-sample/src/main/java/StorageSample.java
+++ b/storage/xml-api/cmdline-sample/src/main/java/StorageSample.java
@@ -22,14 +22,12 @@
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.net.URLEncoder;
 import java.security.GeneralSecurityException;
 import java.util.Collections;
-
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
diff --git a/storage/xml-api/serviceaccount-appengine-sample/README.md b/storage/xml-api/serviceaccount-appengine-sample/README.md
index 8114f0aa4d5..b79ebafa575 100644
--- a/storage/xml-api/serviceaccount-appengine-sample/README.md
+++ b/storage/xml-api/serviceaccount-appengine-sample/README.md
@@ -33,7 +33,7 @@ Running and Deploying Your Application from the Command Line
 
 To run your application locally on a development server:
 
-    mvn appengine:devserver
+    mvn appengine:run
 
 To deploy your application to appspot.com:
 
diff --git a/storage/xml-api/serviceaccount-appengine-sample/pom.xml b/storage/xml-api/serviceaccount-appengine-sample/pom.xml
index ceac61b6a4d..f97eebcc5b6 100644
--- a/storage/xml-api/serviceaccount-appengine-sample/pom.xml
+++ b/storage/xml-api/serviceaccount-appengine-sample/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
   </parent>
 
   <groupId>com.google.apis-samples</groupId>
@@ -82,14 +82,16 @@
       </plugin>
 
       <!--
-        The actual appengine-maven-plugin. Type "mvn appengine:devserver" to run project,
+        The actual appengine-maven-plugin. Type "mvn appengine:run" to run project,
         "mvn appengine:update" to upload to GAE.
       -->
       <plugin>
-        <groupId>com.google.appengine</groupId>
+        <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>1.9.77</version>
+        <version>2.2.0</version>
         <configuration>
+          <projectId>GCLOUD_CONFIG</projectId>
+          <version>gaeinfo</version>
           <port>8888</port>
         </configuration>
       </plugin>
diff --git a/storage/xml-api/serviceaccount-appengine-sample/src/main/java/com/google/api/client/sample/storage/appengine/serviceaccount/StorageSample.java b/storage/xml-api/serviceaccount-appengine-sample/src/main/java/com/google/api/client/sample/storage/appengine/serviceaccount/StorageSample.java
index 54daa10313e..41796b7824d 100644
--- a/storage/xml-api/serviceaccount-appengine-sample/src/main/java/com/google/api/client/sample/storage/appengine/serviceaccount/StorageSample.java
+++ b/storage/xml-api/serviceaccount-appengine-sample/src/main/java/com/google/api/client/sample/storage/appengine/serviceaccount/StorageSample.java
@@ -23,12 +23,10 @@
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
-
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.util.Arrays;
-
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -46,8 +44,7 @@ public class StorageSample extends HttpServlet {
   private static final int HTTP_OK = 200;
 
   /** The base endpoint for Google Cloud Storage api calls. */
-  private static final String GCS_URI =
-      "http://commondatastorage.googleapis.com";
+  private static final String GCS_URI = "http://commondatastorage.googleapis.com";
 
   /** Global configuration of Google Cloud Storage OAuth 2.0 scope. */
   private static final String STORAGE_SCOPE =
@@ -65,35 +62,30 @@ protected void doGet(final HttpServletRequest req, final HttpServletResponse res
       throws IOException {
 
     try {
-      AppIdentityCredential credential = new AppIdentityCredential(
-          Arrays.asList(STORAGE_SCOPE));
+      AppIdentityCredential credential = new AppIdentityCredential(Arrays.asList(STORAGE_SCOPE));
 
       // Set up and execute Google Cloud Storage request.
       String bucketName = req.getRequestURI();
       if (bucketName.equals("/")) {
         resp.sendError(
-            HTTP_NOT_FOUND,
-            "No bucket specified - append /bucket-name to the URL and retry.");
+            HTTP_NOT_FOUND, "No bucket specified - append /bucket-name to the URL and retry.");
         return;
       }
       // Remove any trailing slashes, if found.
-      //[START snippet]
+      // [START snippet]
       String cleanBucketName = bucketName.replaceAll("/$", "");
       String uri = GCS_URI + cleanBucketName;
-      HttpRequestFactory requestFactory =
-          HTTP_TRANSPORT.createRequestFactory(credential);
+      HttpRequestFactory requestFactory = HTTP_TRANSPORT.createRequestFactory(credential);
       GenericUrl url = new GenericUrl(uri);
       HttpRequest request = requestFactory.buildGetRequest(url);
       HttpResponse response = request.execute();
       String content = response.parseAsString();
-      //[END snippet]
+      // [END snippet]
 
       // Display the output XML.
       resp.setContentType("text/xml");
-      BufferedWriter writer = new BufferedWriter(
-          new OutputStreamWriter(resp.getOutputStream()));
-      String formattedContent = content.replaceAll(
-          "(<ListBucketResult)", XSL + "$1");
+      BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(resp.getOutputStream()));
+      String formattedContent = content.replaceAll("(<ListBucketResult)", XSL + "$1");
       writer.append(formattedContent);
       writer.flush();
       resp.setStatus(HTTP_OK);
diff --git a/unittests/pom.xml b/unittests/pom.xml
index 14a7e052794..b920e06d0ac 100644
--- a/unittests/pom.xml
+++ b/unittests/pom.xml
@@ -1,106 +1,110 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>war</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <groupId>com.google.appengine.samples</groupId>
-    <artifactId>unittests-appengine-local-testing-samples</artifactId>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>war</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <groupId>com.google.appengine.samples</groupId>
+  <artifactId>unittests-appengine-local-testing-samples</artifactId>
 
-    <!--
-      The parent pom defines common style checks and testing strategies for our samples.
-      Removing or replacing it should not affect the execution of the samples in anyway.
-    -->
-    <parent>
-        <groupId>com.google.cloud.samples</groupId>
-        <artifactId>shared-configuration</artifactId>
-    <version>1.0.11</version>
-    </parent>
+  <!--
+  The parent pom defines common style checks and testing strategies for our samples.
+  Removing or replacing it should not affect the execution of the samples in anyway.
+  -->
+  <parent>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.0.12</version>
+  </parent>
 
-    <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-    </properties>
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+  </properties>
 
 
 
-    <dependencies>
-        <!-- Compile/runtime dependencies -->
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>1.9.78</version>
-        </dependency>
-        <dependency>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-          <version>2.5</version>
-          <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
-        </dependency>
+  <dependencies>
+    <!-- Compile/runtime dependencies -->
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-1.0-sdk</artifactId>
+      <version>1.9.78</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jstl</groupId>
+      <artifactId>jstl</artifactId>
+      <version>1.2</version>
+    </dependency>
 
-        <!-- Test Dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-testing</artifactId>
-            <version>1.9.78</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-api-stubs</artifactId>
-            <version>1.9.78</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-tools-sdk</artifactId>
-            <version>1.9.78</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>com.google.api-client</groupId>
-          <artifactId>google-api-client-appengine</artifactId>
-          <version>1.30.9</version>
-          <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-testing</artifactId>
+      <version>1.9.78</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-stubs</artifactId>
+      <version>1.9.78</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-tools-sdk</artifactId>
+      <version>1.9.78</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.api-client</groupId>
+      <artifactId>google-api-client-appengine</artifactId>
+      <version>1.30.9</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.3</version>
-                <configuration>
-                    <archiveClasses>true</archiveClasses>
-                    <webResources>
-                        <!-- in order to interpolate version from pom into appengine-web.xml -->
-                        <resource>
-                            <directory>${basedir}/src/main/webapp/WEB-INF</directory>
-                            <filtering>true</filtering>
-                            <targetPath>WEB-INF</targetPath>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.2.3</version>
+        <configuration>
+          <archiveClasses>true</archiveClasses>
+          <webResources>
+            <!-- in order to interpolate version from pom into appengine-web.xml -->
+            <resource>
+              <directory>${basedir}/src/main/webapp/WEB-INF</directory>
+              <filtering>true</filtering>
+              <targetPath>WEB-INF</targetPath>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
 
-            <plugin>
-                <groupId>com.google.appengine</groupId>
-                <artifactId>appengine-maven-plugin</artifactId>
-                <version>$1.9.60</version>
-            </plugin>
-        </plugins>
-    </build>
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>appengine-maven-plugin</artifactId>
+        <version>2.2.0</version>
+        <configuration>
+          <projectId>GCLOUD_CONFIG</projectId>
+          <version>gaeinfo</version>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>