diff --git a/appengine-java11/appengine-simple-jetty-main/pom.xml b/appengine-java11/appengine-simple-jetty-main/pom.xml
index 78bbad106a9..f2703611b48 100644
--- a/appengine-java11/appengine-simple-jetty-main/pom.xml
+++ b/appengine-java11/appengine-simple-jetty-main/pom.xml
@@ -14,7 +14,7 @@
com.google.cloud.samples
shared-configuration
- 1.0.11
+ 1.0.12
@@ -66,7 +66,11 @@
exec-maven-plugin
1.6.0
- java
+
+
+ java
+
+
com.example.appengine.demo.jettymain.Main
diff --git a/appengine-java11/cloudsql/README.md b/appengine-java11/cloudsql/README.md
index cc5cbff7043..51ed1b24b3b 100644
--- a/appengine-java11/cloudsql/README.md
+++ b/appengine-java11/cloudsql/README.md
@@ -62,7 +62,7 @@ cp ../../../appengine-java11/cloudsql/pom.xml ./
The following command will deploy the application to your Google Cloud project:
```
-mvn clean package appengine:deploy -Dapp.deploy.projectId=
+mvn clean package appengine:deploy
```
View your application:
diff --git a/appengine-java11/cloudsql/pom.xml b/appengine-java11/cloudsql/pom.xml
index a3b872097c4..5c802bb84be 100644
--- a/appengine-java11/cloudsql/pom.xml
+++ b/appengine-java11/cloudsql/pom.xml
@@ -29,7 +29,7 @@
com.google.cloud.samples
shared-configuration
- 1.0.11
+ 1.0.12
@@ -139,6 +139,7 @@
appengine-maven-plugin
2.2.0
+ GCLOUD_CONFIG
cloudsql
diff --git a/appengine-java11/gaeinfo/README.md b/appengine-java11/gaeinfo/README.md
index 4117413536b..f3f3a82b466 100644
--- a/appengine-java11/gaeinfo/README.md
+++ b/appengine-java11/gaeinfo/README.md
@@ -44,7 +44,7 @@ Main class to your classpath:
- Deploy to App Engine standard environment using the following Maven command.
```
- mvn appengine:deploy -Dapp.deploy.projectId=
+ mvn clean package appengine:deploy
```
- Direct your browser to `https://.appspot.com`.
- View more in-depth metrics data on the [StackDriver Monitoring Dashboard][dashboard]
diff --git a/appengine-java11/gaeinfo/pom.xml b/appengine-java11/gaeinfo/pom.xml
index 537717a2300..14ec525c878 100644
--- a/appengine-java11/gaeinfo/pom.xml
+++ b/appengine-java11/gaeinfo/pom.xml
@@ -27,7 +27,7 @@ Copyright 2019 Google LLC
com.google.cloud.samples
shared-configuration
- 1.0.11
+ 1.0.12
@@ -86,10 +86,11 @@ Copyright 2019 Google LLC
appengine-maven-plugin
2.2.0
+ GCLOUD_CONFIG
gaeinfo
-
+
org.apache.maven.plugins
maven-war-plugin
diff --git a/appengine-java11/guestbook-cloud-firestore/README.md b/appengine-java11/guestbook-cloud-firestore/README.md
index 8f1e068ebb5..b46d96fdff3 100644
--- a/appengine-java11/guestbook-cloud-firestore/README.md
+++ b/appengine-java11/guestbook-cloud-firestore/README.md
@@ -67,7 +67,7 @@ from the Select a database service screen:
Deploy your application using the maven plugin:
```
-mvn clean package appengine:deploy -Dapp.deploy.projectId=
+mvn clean package appengine:deploy
```
View your application:
diff --git a/appengine-java11/guestbook-cloud-firestore/pom.xml b/appengine-java11/guestbook-cloud-firestore/pom.xml
index c509b26a512..6dbef1675a3 100644
--- a/appengine-java11/guestbook-cloud-firestore/pom.xml
+++ b/appengine-java11/guestbook-cloud-firestore/pom.xml
@@ -26,7 +26,7 @@
com.google.cloud.samples
shared-configuration
- 1.0.11
+ 1.0.12
@@ -96,6 +96,7 @@
appengine-maven-plugin
2.2.0
+ GCLOUD_CONFIG
guestbook
diff --git a/appengine-java11/helloworld-servlet/README.md b/appengine-java11/helloworld-servlet/README.md
index 260f045c581..cd81dab1ebf 100644
--- a/appengine-java11/helloworld-servlet/README.md
+++ b/appengine-java11/helloworld-servlet/README.md
@@ -94,6 +94,6 @@ Then visit: http://localhost:8080/hello
While in the `helloworld-servlet` directory, use the `appengine-maven-plugin` to
deploy your app:
```
-mvn clean package appengine:deploy -Dapp.deploy.projectId=
+mvn clean package appengine:deploy
```
Then visit: https://YOUR-PROJECT-ID.appspot.com/hello
diff --git a/appengine-java11/helloworld-servlet/pom.xml b/appengine-java11/helloworld-servlet/pom.xml
index 507bb616793..5713429c9a7 100644
--- a/appengine-java11/helloworld-servlet/pom.xml
+++ b/appengine-java11/helloworld-servlet/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
com.google.cloud.samples
shared-configuration
- 1.0.11
+ 1.0.12
@@ -72,6 +72,7 @@ limitations under the License.
appengine-maven-plugin
2.2.0
+ GCLOUD_CONFIG
helloworld
diff --git a/appengine-java11/http-server/README.md b/appengine-java11/http-server/README.md
index b27ea236705..e9551b1c81e 100644
--- a/appengine-java11/http-server/README.md
+++ b/appengine-java11/http-server/README.md
@@ -11,7 +11,7 @@ See [Prerequisites](../README.md#Prerequisites).
## Deploy to App Engine Standard
```
-mvn clean package appengine:deploy -Dapp.deploy.projectId=
+mvn clean package appengine:deploy
```
To view your app, use command:
diff --git a/appengine-java11/http-server/pom.xml b/appengine-java11/http-server/pom.xml
index c57d7af722d..b6e49edc728 100644
--- a/appengine-java11/http-server/pom.xml
+++ b/appengine-java11/http-server/pom.xml
@@ -11,7 +11,7 @@
com.google.cloud.samples
shared-configuration
- 1.0.11
+ 1.0.12
@@ -34,12 +34,13 @@
-
+
com.google.cloud.tools
appengine-maven-plugin
2.2.0
+ GCLOUD_CONFIG
http-server
diff --git a/appengine-java11/kotlin-ktor/README.md b/appengine-java11/kotlin-ktor/README.md
index 8405870bcd4..07642d80cba 100644
--- a/appengine-java11/kotlin-ktor/README.md
+++ b/appengine-java11/kotlin-ktor/README.md
@@ -10,7 +10,7 @@ See [Prerequisites](../README.md#Prerequisites).
## Deploying
```bash
- mvn clean package appengine:deploy -Dapp.deploy.projectId=
+ mvn clean package appengine:deploy
```
To view your app, use command:
diff --git a/appengine-java11/kotlin-ktor/pom.xml b/appengine-java11/kotlin-ktor/pom.xml
index 9837a29fc5d..4caec2c2c95 100644
--- a/appengine-java11/kotlin-ktor/pom.xml
+++ b/appengine-java11/kotlin-ktor/pom.xml
@@ -6,7 +6,7 @@ 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,
@@ -15,173 +15,174 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
- 4.0.0
- com.example.appengine
- kotlin-ktor
- 0.0.1
+ 4.0.0
+ com.example.appengine
+ kotlin-ktor
+ 0.0.1
-
-
- com.google.cloud.samples
- shared-configuration
- 1.0.11
-
+
+
+ com.google.cloud.samples
+ shared-configuration
+ 1.0.12
+
-
- official
- UTF-8
- true
- io.ktor.server.netty.EngineMain
- 11
- 11
-
+
+ official
+ UTF-8
+ true
+ io.ktor.server.netty.EngineMain
+ 11
+ 11
+
-
-
- repo1
- https://jcenter.bintray.com
- true
- true
-
-
- repo2
- https://kotlin.bintray.com/ktor
- true
- true
-
-
-
-
-
-
- io.ktor
- ktor-bom
- 1.3.2
- pom
- import
-
-
-
+
+
+ repo1
+ https://jcenter.bintray.com
+ true
+ false
+
+
+ repo2
+ https://kotlin.bintray.com/ktor
+ true
+ false
+
+
+
-
- org.jetbrains.kotlin
- kotlin-stdlib-jdk8
- 1.3.70
-
-
- io.ktor
- ktor-server-netty
-
-
- ch.qos.logback
- logback-classic
- 1.3.0-alpha4
-
-
- io.ktor
- ktor-server-core
-
-
- io.ktor
- ktor-server-host-common
-
-
- io.ktor
- ktor-server-tests
- test
-
+
+ io.ktor
+ ktor-bom
+ 1.3.2
+ pom
+ import
+
+
+
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib-jdk8
+ 1.3.70
+
+
+ io.ktor
+ ktor-server-netty
+
+
+ ch.qos.logback
+ logback-classic
+ 1.3.0-alpha4
+
+
+ io.ktor
+ ktor-server-core
+
+
+ io.ktor
+ ktor-server-host-common
+
+
+ io.ktor
+ ktor-server-tests
+ test
+
+
-
- ${project.basedir}/src
- ${project.basedir}/test
-
-
- ${project.basedir}/resources
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- maven-compiler-plugin
- 1.81.8
-
-
- kotlin-maven-plugin
- org.jetbrains.kotlin
- 1.3.70
-
-
- compile
- compile
-
- enable
-
-
-
- test-compile
- test-compile
-
- enable
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 3.2.0
-
-
-
- true
- ${main.class}
-
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
- 3.2.0
-
-
- make-assembly
- package
- single
-
-
-
- ${main.class}
-
-
-
- jar-with-dependencies
-
-
-
-
-
-
-
- com.google.cloud.tools
- appengine-maven-plugin
- 2.2.0
-
- kotlin-ktor
-
- ./
-
- ${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar
-
-
-
-
+
+ ${project.basedir}/src
+ ${project.basedir}/test
+
+
+ ${project.basedir}/resources
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ maven-compiler-plugin
+ 1.81.8
+
+
+ kotlin-maven-plugin
+ org.jetbrains.kotlin
+ 1.3.70
+
+
+ compile
+ compile
+
+ enable
+
+
+
+ test-compile
+ test-compile
+
+ enable
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 3.2.0
+
+
+
+ true
+ ${main.class}
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+ 3.2.0
+
+
+ make-assembly
+ package
+ single
+
+
+
+ ${main.class}
+
+
+
+ jar-with-dependencies
+
+
+
+
+
+
+
+ com.google.cloud.tools
+ appengine-maven-plugin
+ 2.2.0
+
+ GCLOUD_CONFIG
+ kotlin-ktor
+
+ ./
+
+ ${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar
+
+
+
+
diff --git a/appengine-java11/micronaut-helloworld/README.md b/appengine-java11/micronaut-helloworld/README.md
index 975875c96e4..ab62c4e6c42 100644
--- a/appengine-java11/micronaut-helloworld/README.md
+++ b/appengine-java11/micronaut-helloworld/README.md
@@ -10,7 +10,7 @@ See [Prerequisites](../README.md#Prerequisites).
## Deploying
```bash
- mvn clean package appengine:deploy -Dapp.deploy.projectId=
+ mvn clean package appengine:deploy
```
To view your app, use command:
diff --git a/appengine-java11/micronaut-helloworld/pom.xml b/appengine-java11/micronaut-helloworld/pom.xml
index 85a71279526..10e99594244 100644
--- a/appengine-java11/micronaut-helloworld/pom.xml
+++ b/appengine-java11/micronaut-helloworld/pom.xml
@@ -25,7 +25,7 @@
@@ -114,6 +114,7 @@
appengine-maven-plugin
2.2.0
+ GCLOUD_CONFIG
micronaut-helloworld
diff --git a/appengine-java11/oauth2/README.md b/appengine-java11/oauth2/README.md
index 00d3c12c603..26369e67a9c 100644
--- a/appengine-java11/oauth2/README.md
+++ b/appengine-java11/oauth2/README.md
@@ -49,7 +49,7 @@ origin: `https://.appspot.com/oauth2callback`.
## Deploy to App Engine Standard
```
-mvn clean package appengine:deploy -Dapp.deploy.projectId=
+mvn clean package appengine:deploy
```
To view your app, use command:
diff --git a/appengine-java11/oauth2/pom.xml b/appengine-java11/oauth2/pom.xml
index 49eb3092098..c2a7701dc65 100644
--- a/appengine-java11/oauth2/pom.xml
+++ b/appengine-java11/oauth2/pom.xml
@@ -30,7 +30,7 @@
com.google.cloud.samples
shared-configuration
- 1.0.11
+ 1.0.12
@@ -101,6 +101,7 @@
appengine-maven-plugin
2.2.0
+ GCLOUD_CONFIG
oauth2
diff --git a/appengine-java11/quarkus-helloworld/README.md b/appengine-java11/quarkus-helloworld/README.md
index facd1c43536..54c3f7c1a74 100644
--- a/appengine-java11/quarkus-helloworld/README.md
+++ b/appengine-java11/quarkus-helloworld/README.md
@@ -10,7 +10,7 @@ See [Prerequisites](../README.md#Prerequisites).
## Deploying
```bash
- mvn clean package appengine:deploy -Dapp.deploy.projectId=
+ mvn clean package appengine:deploy
```
To view your app, use command:
diff --git a/appengine-java11/quarkus-helloworld/pom.xml b/appengine-java11/quarkus-helloworld/pom.xml
index 096f8de36d0..9e2b4b7e207 100644
--- a/appengine-java11/quarkus-helloworld/pom.xml
+++ b/appengine-java11/quarkus-helloworld/pom.xml
@@ -1,18 +1,18 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4.0.0
com.example.appengine.quarkus
quarkus-helloworld
@@ -23,9 +23,9 @@
Removing or replacing it should not affect the execution of the samples in anyway.
-->
- com.google.cloud.samples
- shared-configuration
- 1.0.11
+ com.google.cloud.samples
+ shared-configuration
+ 1.0.12
@@ -88,12 +88,13 @@
-
+
com.google.cloud.tools
appengine-maven-plugin
2.2.0
+ GCLOUD_CONFIG
quarkus-helloworld
${project.build.directory}/quarkus-helloworld-1.0-SNAPSHOT-runner.jar
diff --git a/appengine-java11/spanner/README.md b/appengine-java11/spanner/README.md
index 9e28e213349..a16ea39f680 100644
--- a/appengine-java11/spanner/README.md
+++ b/appengine-java11/spanner/README.md
@@ -52,7 +52,7 @@ Note : by default all the spanner example operations run in order, this operatio
## Deploying
```
-mvn clean package appengine:deploy -Dapp.deploy.projectId=
+mvn clean package appengine:deploy
```
To see the results of the deployed sample application, open
diff --git a/appengine-java11/spanner/pom.xml b/appengine-java11/spanner/pom.xml
index 7bd390795e2..44fc829f985 100644
--- a/appengine-java11/spanner/pom.xml
+++ b/appengine-java11/spanner/pom.xml
@@ -30,7 +30,7 @@
com.google.cloud.samples
shared-configuration
- 1.0.11
+ 1.0.12
@@ -110,6 +110,7 @@
appengine-maven-plugin
2.2.0
+ GCLOUD_CONFIG
spanner
diff --git a/appengine-java11/sparkjava-helloworld/README.md b/appengine-java11/sparkjava-helloworld/README.md
index c76adc4171e..a4af6bccd47 100644
--- a/appengine-java11/sparkjava-helloworld/README.md
+++ b/appengine-java11/sparkjava-helloworld/README.md
@@ -10,7 +10,7 @@ See [Prerequisites](../README.md#Prerequisites).
## Deploying
```bash
- mvn clean package appengine:deploy -Dapp.deploy.projectId=
+ mvn clean package appengine:deploy
```
To view your app, use command:
diff --git a/appengine-java11/sparkjava-helloworld/pom.xml b/appengine-java11/sparkjava-helloworld/pom.xml
index 4dfbda14238..331c9d520e5 100644
--- a/appengine-java11/sparkjava-helloworld/pom.xml
+++ b/appengine-java11/sparkjava-helloworld/pom.xml
@@ -29,7 +29,7 @@ limitations under the License.
com.google.cloud.samples
shared-configuration
- 1.0.11
+ 1.0.12
@@ -102,7 +102,8 @@ limitations under the License.
com.google.cloud.tools
appengine-maven-plugin
2.2.0
-
+
+ GCLOUD_CONFIG
${project.build.directory}/sparkjava-helloworld-1.0-jar-with-dependencies.jar
sparkjava-helloworld
diff --git a/appengine-java11/springboot-helloworld/README.md b/appengine-java11/springboot-helloworld/README.md
index a466d9a13e1..33caf449dbd 100644
--- a/appengine-java11/springboot-helloworld/README.md
+++ b/appengine-java11/springboot-helloworld/README.md
@@ -10,7 +10,7 @@ See [Prerequisites](../README.md#Prerequisites).
## Deploying
```bash
- mvn clean package appengine:deploy -Dapp.deploy.projectId=
+ mvn clean package appengine:deploy
```
To view your app, use command:
diff --git a/appengine-java11/springboot-helloworld/pom.xml b/appengine-java11/springboot-helloworld/pom.xml
index 175544b6e2b..3644531546b 100644
--- a/appengine-java11/springboot-helloworld/pom.xml
+++ b/appengine-java11/springboot-helloworld/pom.xml
@@ -25,7 +25,7 @@
com.google.cloud.samples
shared-configuration
- 1.0.11
+ 1.0.12
@@ -94,6 +94,7 @@
appengine-maven-plugin
2.2.0
+ GCLOUD_CONFIG
springboot-helloworld
diff --git a/appengine-java11/tasks-handler/pom.xml b/appengine-java11/tasks-handler/pom.xml
index 025df30a4de..7bb899a900d 100644
--- a/appengine-java11/tasks-handler/pom.xml
+++ b/appengine-java11/tasks-handler/pom.xml
@@ -15,94 +15,95 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
- 4.0.0
- com.example.appengine
- task-handler-j11
- 0.0.1-SNAPSHOT
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ 4.0.0
+ com.example.appengine
+ task-handler-j11
+ 0.0.1-SNAPSHOT
-
-
- com.google.cloud.samples
- shared-configuration
- 1.0.11
-
+
+
+ com.google.cloud.samples
+ shared-configuration
+ 1.0.12
+
-
- 11
- 11
-
+
+ 11
+ 11
+
-
-
-
-
- org.springframework.boot
- spring-boot-dependencies
- 2.2.5.RELEASE
- pom
- import
-
+
+
+
+
+ org.springframework.boot
+ spring-boot-dependencies
+ 2.2.5.RELEASE
+ pom
+ import
+
-
- org.springframework.cloud
- spring-cloud-dependencies
- Hoxton.SR3
- pom
- import
-
-
-
+
+ org.springframework.cloud
+ spring-cloud-dependencies
+ Hoxton.SR3
+ pom
+ import
+
+
+
-
+
-
- org.springframework.boot
- spring-boot-starter-web
- 2.2.5.RELEASE
-
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
-
-
-
-
- org.springframework.boot
- spring-boot-starter-jetty
- 2.2.5.RELEASE
-
+
+ org.springframework.boot
+ spring-boot-starter-web
+ 2.2.5.RELEASE
+
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-jetty
+ 2.2.5.RELEASE
+
-
+
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
- 2.2.5.RELEASE
-
-
-
- repackage
-
-
-
-
-
- com.google.cloud.tools
- appengine-maven-plugin
- 2.2.0
-
- task-handler
-
-
-
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+ 2.2.5.RELEASE
+
+
+
+ repackage
+
+
+
+
+
+ com.google.cloud.tools
+ appengine-maven-plugin
+ 2.2.0
+
+ GCLOUD_CONFIG
+ task-handler
+
+
+
-
+
diff --git a/appengine-java11/tasks/README.md b/appengine-java11/tasks/README.md
index e4b0812dbb2..8a75733771f 100644
--- a/appengine-java11/tasks/README.md
+++ b/appengine-java11/tasks/README.md
@@ -51,7 +51,7 @@ cd java-docs-samples/appengine-java11/task-handler
- Deploy the app
```
-mvn clean package appengine:deploy -Dapp.deploy.projectId=
+mvn clean package appengine:deploy
```
## Run the Sample Using the Command Line
diff --git a/appengine-java11/tasks/pom.xml b/appengine-java11/tasks/pom.xml
index ab4632b4819..b2f6072f12b 100644
--- a/appengine-java11/tasks/pom.xml
+++ b/appengine-java11/tasks/pom.xml
@@ -30,7 +30,7 @@ Copyright 2019 Google LLC
com.google.cloud.samples
shared-configuration
- 1.0.11
+ 1.0.12
diff --git a/appengine-java11/vertx-helloworld/README.md b/appengine-java11/vertx-helloworld/README.md
index 6f3d1dac3d4..6e0b0d7a6f5 100644
--- a/appengine-java11/vertx-helloworld/README.md
+++ b/appengine-java11/vertx-helloworld/README.md
@@ -10,7 +10,7 @@ See [Prerequisites](../README.md#Prerequisites).
## Deploying
```bash
- mvn clean package appengine:deploy -Dapp.deploy.projectId=
+ mvn clean package appengine:deploy
```
## See the application page
diff --git a/appengine-java11/vertx-helloworld/pom.xml b/appengine-java11/vertx-helloworld/pom.xml
index 148e2821f3a..02a5ffc5a92 100644
--- a/appengine-java11/vertx-helloworld/pom.xml
+++ b/appengine-java11/vertx-helloworld/pom.xml
@@ -29,7 +29,7 @@ limitations under the License.
com.google.cloud.samples
shared-configuration
- 1.0.11
+ 1.0.12
@@ -99,8 +99,9 @@ limitations under the License.
appengine-maven-plugin
2.2.0
+ GCLOUD_CONFIG
${project.build.directory}/vertx-hello-j11-1.0-jar-with-dependencies.jar
- vertx-hello-java11
+ vertx-hello-java11