[ChangePassword] Merge with pi
authorJonathan Bueno <jonathan.bueno@openbravo.com>
Thu, 21 Jan 2016 10:56:25 +0100
changeset 28662 788fed01e2a5
parent 28661 55e212abb741 (current diff)
parent 28272 c6ee63dab444 (diff)
child 28663 251285f05aa7
[ChangePassword] Merge with pi
lib/runtime/postgresql-9.4-1201.jdbc4.jar
--- a/build.xml	Thu Jan 21 10:17:24 2016 +0100
+++ b/build.xml	Thu Jan 21 10:56:25 2016 +0100
@@ -1104,7 +1104,7 @@
         <pathelement path="${base.lib}/runtime/log4j-1.2.16.jar" />
         <pathelement path="${base.lib}/runtime/commons-pool-1.5.6.jar" />
         <pathelement path="${base.lib}/runtime/commons-dbcp-1.4.jar" />
-        <pathelement path="${base.lib}/runtime/postgresql-9.4-1201.jdbc4.jar" />
+        <pathelement path="${base.lib}/runtime/postgresql-9.4.1207.jre6.jar" />
         <pathelement path="${base.lib}/runtime/ojdbc6.jar" />
         <pathelement path="${base.lib}/runtime/commons-collectionsi-3.2.1.jar" />
         <pathelement path="${base.lib}/runtime/ant-1.9.2.jar" />
--- a/legal/Licensing.txt	Thu Jan 21 10:17:24 2016 +0100
+++ b/legal/Licensing.txt	Thu Jan 21 10:56:25 2016 +0100
@@ -123,7 +123,7 @@
 All files under Apache Software License 2.0, available at
 http://www.apache.org/licenses/LICENSE-2.0
 
-# postgresql-9.4-1201.jdbc4.jar
+# postgresql-9.4.1207.jre6.jar
 Under the BSD license, also available at http://jdbc.postgresql.org/license.html  
 
 # xstream-1.3.1.jar
Binary file lib/runtime/postgresql-9.4-1201.jdbc4.jar has changed
Binary file lib/runtime/postgresql-9.4.1207.jre6.jar has changed
Binary file src-db/database/lib/dbsourcemanager.jar has changed