RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #79 from skylow95/master

Browse source 
Update JDBC driver
This commit is contained in:
Jeroen Baten 2016-05-05 15:39:52 +02:00
commit 233c6c4616
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libreplan-business/pom.xml
View file

@ -52,7 +52,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.transaction</groupId> <groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.1_spec</artifactId> <artifactId>jboss-transaction-api_1.2_spec</artifactId>
</dependency> </dependency>
<!-- Spring --> <!-- Spring -->

30
pom.xml
View file

@ -118,7 +118,7 @@
<!-- JDBC driver properties --> <!-- JDBC driver properties -->
<jdbcDriver.groupId>org.postgresql</jdbcDriver.groupId> <jdbcDriver.groupId>org.postgresql</jdbcDriver.groupId>
<jdbcDriver.artifactId>postgresql</jdbcDriver.artifactId> <jdbcDriver.artifactId>postgresql</jdbcDriver.artifactId>
<jdbcDriver.version>9.2-1003-jdbc4</jdbcDriver.version> <jdbcDriver.version>9.4.1208.jre7</jdbcDriver.version>
<jdbcDriver.className>org.postgresql.Driver</jdbcDriver.className> <jdbcDriver.className>org.postgresql.Driver</jdbcDriver.className>
<!-- Data source properties --> <!-- Data source properties -->
<dataSource.url>jdbc:postgresql://localhost/libreplan${libreplan.mode}</dataSource.url> <dataSource.url>jdbc:postgresql://localhost/libreplan${libreplan.mode}</dataSource.url>
@ -129,14 +129,16 @@
</properties> </properties>
</profile> </profile>
<!-- MySQL profile --> <!-- MySQL profile
TODO chagne version mysql for JDK8
-->
<profile> <profile>
<id>mysql</id> <id>mysql</id>
<properties> <properties>
<!-- JDBC driver properties --> <!-- JDBC driver properties -->
<jdbcDriver.groupId>mysql</jdbcDriver.groupId> <jdbcDriver.groupId>mysql</jdbcDriver.groupId>
<jdbcDriver.artifactId>mysql-connector-java</jdbcDriver.artifactId> <jdbcDriver.artifactId>mysql-connector-java</jdbcDriver.artifactId>
<jdbcDriver.version>5.0.5</jdbcDriver.version> <jdbcDriver.version>6.0.2</jdbcDriver.version>
<jdbcDriver.className>com.mysql.jdbc.Driver</jdbcDriver.className> <jdbcDriver.className>com.mysql.jdbc.Driver</jdbcDriver.className>
<!-- Data source properties --> <!-- Data source properties -->
<dataSource.url>jdbc:mysql://localhost/libreplan${libreplan.mode}</dataSource.url> <dataSource.url>jdbc:mysql://localhost/libreplan${libreplan.mode}</dataSource.url>
@ -260,15 +262,15 @@
<!-- Usertype.Core --> <!-- Usertype.Core -->
<dependency> <dependency>
<groupId>org.jadira.usertype</groupId> <groupId>org.jadira.usertype</groupId>
<artifactId>usertype.core</artifactId> <artifactId>usertype.core</artifactId>
<version>3.2.0.GA</version> <version>3.2.0.GA</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId> <artifactId>hibernate-entitymanager</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- JDBC driver --> <!-- JDBC driver -->
@ -280,7 +282,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.transaction</groupId> <groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.1_spec</artifactId> <artifactId>jboss-transaction-api_1.2_spec</artifactId>
<version>1.0.1.Final</version> <version>1.0.1.Final</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions> <exclusions>
@ -820,7 +822,7 @@
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- Jetty configuration --> <!-- Jetty configuration -->
<plugin> <plugin>
<!-- TODO Change version for JDK8 -->
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId> <artifactId>maven-jetty-plugin</artifactId>
<version>6.1.18</version> <version>6.1.18</version>