Author: tv
Date: Mon Aug 27 08:53:35 2018
New Revision: 1839280
URL: http://svn.apache.org/viewvc?rev=1839280&view=rev
Log:
Adapt to latest mysql driver version
Modified:
db/torque/torque4/trunk/torque-test/pom.xml
db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties
Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1839280&r1=1839279&r2=1839280&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Mon Aug 27 08:53:35 2018
@@ -911,6 +911,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
+ <torque.test.mysql.version>8.0.12</torque.test.mysql.version>
<torque.test.profileDirectory>mysql</torque.test.profileDirectory>
<torque.test.idmethod>native</torque.test.idmethod>
<torque.test.databaseSchema>bookstore</torque.test.databaseSchema>
@@ -922,9 +923,9 @@
<torque.test.currentDateDefault /><!-- default="CURRENT_DATE" if
database supports it -->
<torque.test.currentTimeDefault /><!-- default="CURRENT_TIME" if
database supports it -->
<torque.test.currentTimestampDefault /><!--
default="CURRENT_TIMESTAMP" if database supports it -->
- <torque.driver>org.gjt.mm.mysql.Driver</torque.driver>
+ <torque.driver>com.mysql.cj.jdbc.Driver</torque.driver>
<torque.targetDatabase>mysql</torque.targetDatabase>
-
<torque.database.url>jdbc:mysql://localhost:3306/bookstore</torque.database.url>
+
<torque.database.url>jdbc:mysql://localhost:3306/bookstore?serverTimezone=Europe/Berlin&useSSL=false</torque.database.url>
<torque.database.user>torque</torque.database.user>
<torque.database.password>torque</torque.database.password>
<torque.database.shutdown.url>none</torque.database.shutdown.url>
@@ -932,9 +933,9 @@
</properties>
<dependencies>
<dependency>
- <artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
- <version>5.1.17</version>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${torque.test.mysql.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -945,9 +946,9 @@
<artifactId>sql-maven-plugin</artifactId>
<dependencies>
<dependency>
- <artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
- <version>5.0.4</version>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${torque.test.mysql.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -955,9 +956,9 @@
<artifactId>maven-antrun-plugin</artifactId>
<dependencies>
<dependency>
- <artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
- <version>5.0.4</version>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${torque.test.mysql.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -1141,66 +1142,6 @@
</dependency>
</dependencies>
</plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>tv</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <torque.test.profileDirectory>tv</torque.test.profileDirectory>
- <torque.test.idmethod>idbroker</torque.test.idmethod>
- <torque.test.databaseSchema>bookstore</torque.test.databaseSchema>
-
<torque.test.onUpdateCascade>onUpdate="cascade"</torque.test.onUpdateCascade>
-
<torque.test.onUpdateSetNull>onUpdate="setnull"</torque.test.onUpdateSetNull>
-
<torque.test.onUpdateRestrict>onUpdate="restrict"</torque.test.onUpdateRestrict>
-
<torque.test.onDeleteRestrict>onDelete="restrict"</torque.test.onDeleteRestrict>
- <torque.test.bitDataType>BIT</torque.test.bitDataType><!-- BIT if
database supports bIT type, something else if not -->
-
<torque.test.currentDateDefault>default="CURRENT_DATE"</torque.test.currentDateDefault><!--
default="CURRENT_DATE" if database supports it -->
-
<torque.test.currentTimeDefault>default="CURRENT_TIME"</torque.test.currentTimeDefault><!--
default="CURRENT_TIME" if database supports it -->
-
<torque.test.currentTimestampDefault>default="CURRENT_TIMESTAMP"</torque.test.currentTimestampDefault><!--
default="CURRENT_TIMESTAMP" if database supports it -->
- <torque.driver>org.gjt.mm.mysql.Driver</torque.driver>
- <torque.targetDatabase>mysql</torque.targetDatabase>
-
<torque.database.url>jdbc:mysql://gatekeeper.home.lan:3306/bookstore</torque.database.url>
- <torque.database.user>torque</torque.database.user>
- <torque.database.password>torque</torque.database.password>
- <torque.database.shutdown.url>none</torque.database.shutdown.url>
- <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
- </properties>
- <dependencies>
- <dependency>
- <artifactId>mysql-connector-java</artifactId>
- <groupId>mysql</groupId>
- <version>3.1.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>sql-maven-plugin</artifactId>
- <dependencies>
- <dependency>
- <artifactId>mysql-connector-java</artifactId>
- <groupId>mysql</groupId>
- <version>3.1.12</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <artifactId>mysql-connector-java</artifactId>
- <groupId>mysql</groupId>
- <version>3.1.12</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
</profile>
Modified:
db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties?rev=1839280&r1=1839279&r2=1839280&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties
(original)
+++
db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties
Mon Aug 27 08:53:35 2018
@@ -26,8 +26,8 @@ torque.database.bookstore.adapter = mysq
# Using commons-dbcp
torque.dsfactory.bookstore.factory =
org.apache.torque.dsfactory.SharedPoolDataSourceFactory
-torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver
-torque.dsfactory.bookstore.connection.url =
jdbc:mysql://localhost:3306/bookstore
+torque.dsfactory.bookstore.connection.driver = com.mysql.cj.jdbc.Driver
+torque.dsfactory.bookstore.connection.url =
jdbc:mysql://localhost:3306/bookstore?serverTimezone=Europe/Berlin&useSSL=false
torque.dsfactory.bookstore.connection.user = torque
torque.dsfactory.bookstore.connection.password = torque
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
