Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
upgrade mysql driver version
Browse files Browse the repository at this point in the history
- so that it can connect to paralell server running in functional test
see jcabi/jcabi-mysql-maven-plugin#9 for detail
  • Loading branch information
Patrick Huang committed Dec 19, 2013
1 parent 560e3a2 commit 5d6cc78
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 60 deletions.
57 changes: 6 additions & 51 deletions functional-test/pom.xml
Expand Up @@ -30,16 +30,15 @@
<!--data source-->
<jdbc.groupId>mysql</jdbc.groupId>
<jdbc.artifactId>mysql-connector-java</jdbc.artifactId>
<!-- This version must match the version used in JBoss. -->
<jdbc.version>5.1.9</jdbc.version>
<jdbc.version>5.1.26</jdbc.version>

<ds.jndi.name>zanataDatasource</ds.jndi.name>
<ds.database>zanata_functional</ds.database>
<!--<ds.hibernate.dialect>org.hibernate.dialect.H2Dialect</ds.hibernate.dialect>-->
<!--mysql-maven-plugin will use these setup-->
<ds.database>root</ds.database>
<ds.username>root</ds.username>
<ds.password>root</ds.password>
<ds.connection.url>jdbc:mysql://localhost:${mysql.port}/${ds.database}?characterEncoding=UTF-8</ds.connection.url>
<ds.driver.class>com.mysql.jdbc.Driver</ds.driver.class>
<ds.username>zanata</ds.username>
<ds.password>zanata</ds.password>

<!--target zanata instance-->
<zanata.target.version>${project.parent.version}</zanata.target.version>
Expand Down Expand Up @@ -335,6 +334,7 @@
<goals>
<goal>reserve-network-port</goal>
</goals>
<phase>generate-test-resources</phase>
<configuration>
<portNames>
<portName>mysql.port</portName>
Expand Down Expand Up @@ -385,51 +385,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>sql-maven-plugin</artifactId>
<dependencies>
<!-- specify the dependent JDBC driver here -->
<dependency>
<groupId>${jdbc.groupId}</groupId>
<artifactId>${jdbc.artifactId}</artifactId>
<version>${jdbc.version}</version>
</dependency>
</dependencies>

<!-- common configuration shared by all executions -->
<configuration>
<driver>${ds.driver.class}</driver>
<url>jdbc:mysql://localhost:${mysql.port}/test?characterEncoding=UTF-8</url>
<username>${ds.username}</username>
<password>${ds.password}</password>
</configuration>

<executions>
<execution>
<id>drop-database</id>
<phase>pre-integration-test</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<sqlCommand>drop database if exists ${ds.database}</sqlCommand>
<onError>continue</onError>
</configuration>
</execution>
<execution>
<id>create-database</id>
<phase>pre-integration-test</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<sqlCommand>create database ${ds.database}</sqlCommand>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
Expand Down
9 changes: 0 additions & 9 deletions pom.xml
Expand Up @@ -53,10 +53,6 @@

<!-- JBoss version for dependencies (arquillian, jboss-as-parent) -->
<jboss.as.version>7.2.0.Final</jboss.as.version>

<!-- mysql maven plugin-->
<mysql.classifier>linux-amd64</mysql.classifier>
<mysql.port>13306</mysql.port>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -720,11 +716,6 @@
<artifactId>jcabi-mysql-maven-plugin</artifactId>
<version>0.3</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>sql-maven-plugin</artifactId>
<version>1.5</version>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down

0 comments on commit 5d6cc78

Please sign in to comment.