Skip to content

Update Maven config GAE 11 #2441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions appengine-java11/appengine-simple-jetty-main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.0.11</version>
<version>1.0.12</version>
</parent>

<properties>
Expand Down Expand Up @@ -66,7 +66,11 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<executions>
<execution><goals><goal>java</goal></goals></execution>
<execution>
<goals>
<goal>java</goal>
</goals>
</execution>
</executions>
<configuration>
<mainClass>com.example.appengine.demo.jettymain.Main</mainClass>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java11/cloudsql/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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=<your-project-id>
mvn clean package appengine:deploy
```

View your application:
Expand Down
3 changes: 2 additions & 1 deletion appengine-java11/cloudsql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.0.11</version>
<version>1.0.12</version>
</parent>

<properties>
Expand Down Expand Up @@ -139,6 +139,7 @@
<artifactId>appengine-maven-plugin</artifactId>
<version>2.2.0</version>
<configuration>
<projectId>GCLOUD_CONFIG</projectId>
<version>cloudsql</version>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java11/gaeinfo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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=<your-project-id>
mvn clean package appengine:deploy
```
- Direct your browser to `https://<your-project-id>.appspot.com`.
- View more in-depth metrics data on the [StackDriver Monitoring Dashboard][dashboard]
Expand Down
5 changes: 3 additions & 2 deletions appengine-java11/gaeinfo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Copyright 2019 Google LLC
<parent>
<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.0.11</version>
<version>1.0.12</version>
</parent>

<properties>
Expand Down Expand Up @@ -86,10 +86,11 @@ Copyright 2019 Google LLC
<artifactId>appengine-maven-plugin</artifactId>
<version>2.2.0</version>
<configuration>
<projectId>GCLOUD_CONFIG</projectId>
<version>gaeinfo</version>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java11/guestbook-cloud-firestore/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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=<your-project-id>
mvn clean package appengine:deploy
```

View your application:
Expand Down
3 changes: 2 additions & 1 deletion appengine-java11/guestbook-cloud-firestore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -96,6 +96,7 @@
<artifactId>appengine-maven-plugin</artifactId>
<version>2.2.0</version>
<configuration>
<projectId>GCLOUD_CONFIG</projectId>
<version>guestbook</version>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java11/helloworld-servlet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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=<your-project-id>
mvn clean package appengine:deploy
```
Then visit: https://YOUR-PROJECT-ID.appspot.com/hello
3 changes: 2 additions & 1 deletion appengine-java11/helloworld-servlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.0.11</version>
<version>1.0.12</version>
</parent>

<!-- [START gae_java11_properties] -->
Expand Down Expand Up @@ -72,6 +72,7 @@ limitations under the License.
<artifactId>appengine-maven-plugin</artifactId>
<version>2.2.0</version>
<configuration>
<projectId>GCLOUD_CONFIG</projectId>
<version>helloworld</version>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java11/http-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ See [Prerequisites](../README.md#Prerequisites).
## Deploy to App Engine Standard

```
mvn clean package appengine:deploy -Dapp.deploy.projectId=<your-project-id>
mvn clean package appengine:deploy
```

To view your app, use command:
Expand Down
5 changes: 3 additions & 2 deletions appengine-java11/http-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.0.11</version>
<version>1.0.12</version>
</parent>


Expand All @@ -34,12 +34,13 @@
</archive>
</configuration>
</plugin>

<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>2.2.0</version>
<configuration>
<projectId>GCLOUD_CONFIG</projectId>
<version>http-server</version>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java11/kotlin-ktor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ See [Prerequisites](../README.md#Prerequisites).
## Deploying

```bash
mvn clean package appengine:deploy -Dapp.deploy.projectId=<your-project-id>
mvn clean package appengine:deploy
```

To view your app, use command:
Expand Down
Loading