Merge branch 'master' into iot-mqtt-refresh

Author: gguuss

.circleci/config.yml

@@ -85,7 +85,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.11.0</version>
+      <version>2.12.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

.gitmodules

@@ -31,7 +31,7 @@ limitations under the License.
   </parent>
 
   <properties>
-    <appengine.maven.plugin>1.3.1</appengine.maven.plugin>
+    <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>

.mvn/wrapper/maven-wrapper.jar

@@ -37,7 +37,7 @@
         <endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
-        <appengine.maven.plugin.version>1.3.1</appengine.maven.plugin.version>
+        <appengine.maven.plugin.version>1.3.2</appengine.maven.plugin.version>
     </properties>
 
     <dependencies>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>com.google.endpoints</groupId>
             <artifactId>endpoints-management-control-appengine-all</artifactId>
-            <version>1.0.5</version>
+            <version>1.0.6</version>
         </dependency>
         <dependency>
             <groupId>com.google.appengine</groupId>

.mvn/wrapper/maven-wrapper.properties

@@ -37,7 +37,7 @@
         <endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
-        <appengine.maven.plugin.version>1.3.1</appengine.maven.plugin.version>
+        <appengine.maven.plugin.version>1.3.2</appengine.maven.plugin.version>
     </properties>
 
     <dependencies>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>com.google.endpoints</groupId>
             <artifactId>endpoints-management-control-appengine-all</artifactId>
-            <version>1.0.5</version>
+            <version>1.0.6</version>
         </dependency>
         <dependency>
             <groupId>com.google.appengine</groupId>

.travis.yml

@@ -36,13 +36,10 @@ repositories {   // repositories for Jar's you access in your code
 apply plugin: 'java'                              // standard Java tasks
 apply plugin: 'war'                               // standard Web Archive plugin
 
-// [START apply_appengine]
-apply plugin: 'com.google.cloud.tools.appengine'  // App Engine tasks
-// [END apply_appengine]
-
-// [START apply_endpoints-framework-server]
+// [START apply_plugins]
+apply plugin: 'com.google.cloud.tools.appengine'
 apply plugin: 'com.google.cloud.tools.endpoints-framework-server'
-// [END apply_endpoints-framework-server]
+// [END apply_plugins]
 
 dependencies {
   providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version:'3.1.0'