This is an automated email from the ASF dual-hosted git repository.
painter pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
The following commit(s) were added to refs/heads/master by this push:
new 67f5f90 Update MySQL driver and the JNDI url to support timezone info
67f5f90 is described below
commit 67f5f90b227682f4bb43a764554f2cd51b7ebb45
Author: jlpainter <[email protected]>
AuthorDate: Wed Apr 10 11:12:43 2019 -0400
Update MySQL driver and the JNDI url to support timezone info
---
src/main/resources/archetype-resources/pom.xml | 8 +++++---
.../archetype-resources/src/main/webapp/META-INF/context.xml | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/archetype-resources/pom.xml
b/src/main/resources/archetype-resources/pom.xml
index 68f298d..89e1877 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -200,7 +200,7 @@ under the License.
<dependency>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
- <version>8.0.13</version>
+ <version>8.0.15</version>
</dependency>
</dependencies>
<!-- this is mysql specific -->
@@ -267,7 +267,7 @@ under the License.
<dependency>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
- <version>8.0.13</version>
+ <version>8.0.15</version>
</dependency>
<!-- Allow lookup of #var("web:rootDir") in log4j2 file -->
<dependency>
@@ -276,6 +276,7 @@ under the License.
<version>#var("log4j2.version")</version>
</dependency>
<!-- Required for Java 9 and higher -->
+ <!--
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
@@ -291,7 +292,8 @@ under the License.
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
</dependency>
-
+ -->
+
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
diff --git
a/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
b/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
index f458f40..d448f52 100644
---
a/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
+++
b/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
@@ -4,7 +4,7 @@
<WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
<Resource name="${turbine_database_jndipath}"
global="${turbine_database_jndipath}" auth="Container"
type="javax.sql.DataSource"
driverClassName="${turbine_database_driver}"
- url="${turbine_database_url}${turbine_database_name}"
+
url="${turbine_database_url}${turbine_database_name}?serverTimezone=${turbine_database_timezone}"
username="${turbine_database_user}"
password="${turbine_database_password}"
maxTotal="100" maxIdle="20" minIdle="5" maxWaitMillis="10000"/>
</Context>
