Skip to content

Update Region Tags for GAE #1277

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.

Sign up for GitHub

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 2 commits into from
Dec 4, 2018
Merged

Update Region Tags for GAE #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57ad5dd
update region tags
averikitsch Dec 4, 2018
0319c58
Merge branch 'master' into region-tags
averikitsch Dec 4, 2018
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: 4 additions & 4 deletions appengine-java8/cloudsql-postgres/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<version>1.27.0</version>
</dependency>

<!-- [START dependencies] -->
<!-- [START gae_java8_postgres_dependencies] -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
Expand All @@ -81,14 +81,14 @@
<artifactId>postgres-socket-factory</artifactId>
<version>1.0.11</version>
</dependency>
<!-- [END dependencies] -->
<!-- [END gae_java8_postgres_dependencies] -->
</dependencies>

<build>
<!-- for hot reload of the web application -->
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
<plugins>
<!-- [START plugins] -->
<!-- [START gae_java8_postgres_plugins] -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
Expand All @@ -114,7 +114,7 @@
<deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>
</configuration>
</plugin>
<!-- [END plugins] -->
<!-- [END gae_java8_postgres_plugins] -->
</plugins>
</build>
</project>
8 changes: 4 additions & 4 deletions appengine-java8/cloudsql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<version>1.27.0</version>
</dependency>

<!-- [START dependencies] -->
<!-- [START gae_java8_mysql_dependencies] -->
<dependency> <!-- Only used locally -->
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
Expand All @@ -82,13 +82,13 @@
<artifactId>mysql-socket-factory</artifactId>
<version>1.0.11</version>
</dependency>
<!-- [END dependencies] -->
<!-- [END gae_java8_mysql_dependencies] -->
</dependencies>
<build>
<!-- for hot reload of the web application -->
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
<plugins>
<!-- [START plugins] -->
<!-- [START gae_java8_mysql_plugins] -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
Expand All @@ -114,7 +114,7 @@
<deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>
</configuration>
</plugin>
<!-- [END plugins] -->
<!-- [END gae_java8_mysql_plugins] -->
</plugins>
</build>
</project>
12 changes: 6 additions & 6 deletions appengine/cloudsql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<version>1.0.9</version>
</parent>

<!-- [START properties] -->
<!-- [START gae_java_mysql_properties] -->
<properties>
<!-- INSTANCE_CONNECTION_NAME from Cloud Console > SQL > Instance Details > Properties
or gcloud sql instances describe <instance>
Expand All @@ -48,7 +48,7 @@
<maven.compiler.source>1.7</maven.compiler.source>
<!-- [END_EXCLUDE] -->
</properties>
<!-- [END properties] -->
<!-- [END gae_java_mysql_properties] -->
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
Expand All @@ -71,7 +71,7 @@
</dependency>


<!-- [START dependencies] -->
<!-- [START gae_java_mysql_dependencies] -->
<dependency> <!-- ONLY USED LOCALY -->
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
Expand All @@ -82,13 +82,13 @@
<artifactId>mysql-socket-factory</artifactId>
<version>1.0.11</version>
</dependency>
<!-- [END dependencies] -->
<!-- [END gae_java_mysql_dependencies] -->
</dependencies>
<build>
<!-- for hot reload of the web application -->
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
<plugins>
<!-- [START plugins] -->
<!-- [START gae_java_mysql_plugins] -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
Expand All @@ -114,7 +114,7 @@
<deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>
</configuration>
</plugin>
<!-- [END plugins] -->
<!-- [END gae_java_mysql_plugins] -->
</plugins>
</build>
</project>