From 1a2d870aa161677ed2db3f2904859b706eaad89e Mon Sep 17 00:00:00 2001
From: vmazurashu <mazurashuvadim@gmail.com>
Date: Wed, 1 Aug 2018 11:23:05 +0300
Subject: [PATCH] 1870: update postgresql jdbc driver version, add explicitly
 org.zkoss.common.zweb

---
 pom.xml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 646135434..82354f643 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
                 <!-- JDBC driver properties -->
                 <jdbcDriver.groupId>org.postgresql</jdbcDriver.groupId>
                 <jdbcDriver.artifactId>postgresql</jdbcDriver.artifactId>
-                <jdbcDriver.version>9.4.1208.jre7</jdbcDriver.version>
+                <jdbcDriver.version>42.2.4.jre7</jdbcDriver.version>
                 <jdbcDriver.className>org.postgresql.Driver</jdbcDriver.className>
                 <!-- Data source properties -->
                 <dataSource.url>jdbc:postgresql://localhost/libreplan${libreplan.mode}</dataSource.url>
@@ -466,6 +466,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.zkoss.common</groupId>
+                <artifactId>zweb</artifactId>
+                <version>5.0.11</version>
+            </dependency>
 
             <!-- JGraphT -->
             <dependency>
@@ -602,6 +607,10 @@
                         <groupId>org.zkoss.common</groupId>
                         <artifactId>zcommon</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.zkoss.common</groupId>
+                        <artifactId>zweb</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -867,11 +876,11 @@
                         <artifactId>slf4j-simple</artifactId>
                         <version>1.7.21</version>
 					   <exclusions>
-					      <exclusion> 
+					      <exclusion>
 					        <groupId>org.slf4j</groupId>
 					        <artifactId>slf4j-simple</artifactId>
 					      </exclusion>
-					    </exclusions> 
+					    </exclusions>
                     </dependency>
 
                     <dependency>