Merge branch 'master' into dpebot-repositorygardener

GoogleCloudPlatform · May 17, 2018 · 5723331 · 5723331
2 parents 72efc35 + 131dcfe
commit 5723331
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 26 deletions.
diff --git a/appengine-java8/cloudsql-postgres/pom.xml b/appengine-java8/cloudsql-postgres/pom.xml
@@ -88,6 +88,7 @@
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     <plugins>
+      <!-- [START plugins] -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
@@ -113,7 +114,7 @@
           <deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>
         </configuration>
       </plugin>
-
+      <!-- [END plugins] -->
     </plugins>
   </build>
 </project>
diff --git a/appengine-java8/cloudsql/pom.xml b/appengine-java8/cloudsql/pom.xml
@@ -88,6 +88,7 @@
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     <plugins>
+      <!-- [START plugins] -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
@@ -113,7 +114,7 @@
           <deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>
         </configuration>
       </plugin>
-
+      <!-- [END plugins] -->
     </plugins>
   </build>
 </project>
diff --git a/appengine/cloudsql/pom.xml b/appengine/cloudsql/pom.xml
@@ -88,6 +88,7 @@
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     <plugins>
+      <!-- [START plugins] -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
@@ -104,18 +105,16 @@
         </configuration>
       </plugin>
 
-<!--
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>${appengine.maven.plugin}</version>
-      </plugin>
- -->
-      <plugin>
-        <groupId>com.google.appengine</groupId>
-        <artifactId>appengine-maven-plugin</artifactId>
-        <version>1.9.59</version>
+        <version>1.3.1</version>
+        <configuration>
+          <deploy.promote>true</deploy.promote>
+          <deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>
+        </configuration>
       </plugin>
+      <!-- [END plugins] -->
     </plugins>
   </build>
 </project>
diff --git a/flexible/cloudsql/pom.xml b/flexible/cloudsql/pom.xml
@@ -89,22 +89,22 @@
     <!-- [END dependencies] -->
   </dependencies>
   <build>
+    <!-- [START resources] -->
     <resources>
       <resource>
         <directory>src/main/resources</directory>
         <filtering>true</filtering>
       </resource>
     </resources>
+    <!-- [END resources] -->
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     <plugins>
-
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
         <version>1.3.1</version>
       </plugin>
-
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>

diff --git a/flexible/cloudsql/src/main/resources/config.properties b/flexible/cloudsql/src/main/resources/config.properties
@@ -11,5 +11,6 @@
 # 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.
-
+# [START properties]
 sqlUrl=${sqlURL}
+# [END properties]
diff --git a/flexible/postgres/pom.xml b/flexible/postgres/pom.xml
@@ -90,12 +90,14 @@
     <!-- [END dependencies] -->
   </dependencies>
   <build>
+    <!-- [START resources] -->
     <resources>
       <resource>
         <directory>src/main/resources</directory>
         <filtering>true</filtering>
       </resource>
     </resources>
+    <!-- [END resources] -->
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     <plugins>

diff --git a/flexible/postgres/src/main/resources/config.properties b/flexible/postgres/src/main/resources/config.properties
@@ -11,5 +11,6 @@
 # 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.
-
+# [START properties]
 sqlUrl=${sqlURL}
+# [END properties]
diff --git a/iap/src/main/java/com/example/iap/BuildIapRequest.java b/iap/src/main/java/com/example/iap/BuildIapRequest.java
@@ -15,7 +15,7 @@
  */
 
 package com.example.iap;
-// [START generate_iap_request]
+// [START iap_make_request]
 
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpHeaders;
@@ -150,4 +150,4 @@ public static HttpRequest buildIapRequest(HttpRequest request, String iapClientI
         .setHeaders(httpHeaders);
   }
 }
-// [END generate_iap_request]
+// [END iap_make_request]
diff --git a/iap/src/main/java/com/example/iap/VerifyIapRequestHeader.java b/iap/src/main/java/com/example/iap/VerifyIapRequestHeader.java
@@ -15,7 +15,7 @@
  */
 
 package com.example.iap;
-// [START verify_iap_request]
+// [START iap_validate_jwt]
 
 import com.google.api.client.http.HttpRequest;
 import com.google.common.base.Preconditions;
@@ -130,4 +130,4 @@ private boolean verifyJwt(String jwtToken, String expectedAudience) throws Excep
     return signedJwt.verify(jwsVerifier);
   }
 }
-// [END verify_iap_request]
+// [END iap_validate_jwt]
diff --git a/logging/jul/src/main/java/com/example/logging/jul/Quickstart.java b/logging/jul/src/main/java/com/example/logging/jul/Quickstart.java
@@ -16,7 +16,7 @@
 
 package com.example.logging.jul;
 
-// [START jul_quickstart]
+// [START logging_jul_quickstart]
 
 import java.util.logging.Logger;
 
@@ -28,4 +28,4 @@ public static void main(String[] args) {
     logger.severe("Logging ERROR with java.util.logging");
   }
 }
-// [END jul_quickstart]
+// [END logging_jul_quickstart]
diff --git a/logging/jul/src/main/resources/logging.properties b/logging/jul/src/main/resources/logging.properties
@@ -15,7 +15,7 @@
 
 # A default java.util.logging configuration.
 #
-# [START jul_config]
+# [START logging_jul_config]
 # To use this configuration, add to system properties : -Djava.util.logging.config.file="/path/to/file"
 #
 .level = INFO
@@ -44,4 +44,4 @@ java.util.logging.SimpleFormatter.format=%3$s: %5$s%6$s
 
 #optional enhancers (to add additional fields, labels)
 com.google.cloud.logging.LoggingHandler.enhancers=com.example.logging.jul.enhancers.ExampleEnhancer
-# [END jul_config]
+# [END logging_jul_config]
diff --git a/logging/logback/src/main/java/com/example/logging/logback/Quickstart.java b/logging/logback/src/main/java/com/example/logging/logback/Quickstart.java
@@ -16,7 +16,7 @@
 
 package com.example.logging.logback;
 
-// [START logback_quickstart]
+// [START logging_logback_quickstart]
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,4 +29,4 @@ public static void main(String[] args) {
     logger.error("Logging ERROR with Logback");
   }
 }
-// [END logback_quickstart]
+// [END logging_logback_quickstart]
diff --git a/logging/logback/src/main/resources/logback.xml b/logging/logback/src/main/resources/logback.xml
@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- [START logback_config] -->
+<!-- [START logging_logback_config] -->
 <configuration>
   <appender name="CLOUD" class="com.google.cloud.logging.logback.LoggingAppender">
     <!-- Optional : filter logs at or above a level -->
@@ -30,4 +30,4 @@
     <appender-ref ref="CLOUD" />
   </root>
 </configuration>
-<!-- [END logback_config] -->
+<!-- [END logging_logback_config] -->