# HG changeset patch
# Parent 79754b263923368987744b8b90add6212e581923
#224260: Update JDBC drivers

diff --git a/db.drivers/external/binaries-list b/db.drivers/external/binaries-list
--- a/db.drivers/external/binaries-list
+++ b/db.drivers/external/binaries-list
@@ -1,3 +1,3 @@
-85DFEDAD243DC0303AD7AE3A323C39421D220690 mysql-connector-java-5.1.18-bin.jar
-9BFABE48876EC38F6CBAA6931BAD05C64A9EA942 postgresql-9.1-901.jdbc4.jar
+C264E2114579474D13DD808A510FC74E762DDA8C mysql-connector-java-5.1.23-bin.jar
+65B528162F7CF20B4D44BC31A446724E217BA35B postgresql-9.2-1002.jdbc4.jar
 
diff --git a/db.drivers/external/mysql-connector-java-5.1.18-bin-license.txt b/db.drivers/external/mysql-connector-java-5.1.23-bin-license.txt
rename from db.drivers/external/mysql-connector-java-5.1.18-bin-license.txt
rename to db.drivers/external/mysql-connector-java-5.1.23-bin-license.txt
--- a/db.drivers/external/mysql-connector-java-5.1.18-bin-license.txt
+++ b/db.drivers/external/mysql-connector-java-5.1.23-bin-license.txt
@@ -1,10 +1,10 @@
 Name: MySQL Connector/J
-Version: 5.1.18
+Version: 5.1.23
 Description: Allows Java programs to interact with a MySQL database
 License: GPL
 OSR: 7015
 Origin: http://dev.mysql.com/downloads/connector/j/
-Files: mysql-connector-java-5.1.18-bin.jar
+Files: mysql-connector-java-5.1.23-bin.jar
 Source: http://dev.mysql.com/downloads/connector/j/
 Comment: Out-of-the-box support for MySQL Java database applications
 
diff --git a/db.drivers/external/postgresql-9.1-901-license.txt b/db.drivers/external/postgresql-9.2-1002-license.txt
rename from db.drivers/external/postgresql-9.1-901-license.txt
rename to db.drivers/external/postgresql-9.2-1002-license.txt
--- a/db.drivers/external/postgresql-9.1-901-license.txt
+++ b/db.drivers/external/postgresql-9.2-1002-license.txt
@@ -1,10 +1,35 @@
 Name: PostgreSQL JDBC Driver
-Version: 9.1-901
+Version: 9.2-1002
 Description: Allows Java programs to interact with a PostgreSQL database
 License: BSD
 OSR: 7016
 Origin: http://jdbc.postgresql.org/license.html
-Files: postgresql-9.1-901.jdbc4.jar
+Files: postgresql-9.2-1002.jdbc4.jar
 Comment: Out-of-the-box support for Postgres Java database applications
 
-Copyright (c) 1997-2010, PostgreSQL Global Development Group
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice,
   this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
3. Neither the name of the PostgreSQL Global Development Group nor the names
   of its contributors may be used to endorse or promote products derived
   from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
+Copyright (c) 1997-2011, PostgreSQL Global Development Group
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. Neither the name of the PostgreSQL Global Development Group nor the names
+   of its contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/db.drivers/nbproject/project.properties b/db.drivers/nbproject/project.properties
--- a/db.drivers/nbproject/project.properties
+++ b/db.drivers/nbproject/project.properties
@@ -42,8 +42,8 @@
 
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.6
-release.external/mysql-connector-java-5.1.18-bin.jar=modules/ext/mysql-connector-java-5.1.18-bin.jar
-release.external/postgresql-9.1-901.jdbc4.jar=modules/ext/postgresql-9.1-901.jdbc4.jar
+release.external/mysql-connector-java-5.1.23-bin.jar=modules/ext/mysql-connector-java-5.1.23-bin.jar
+release.external/postgresql-9.2-1002.jdbc4.jar=modules/ext/postgresql-9.2-1002.jdbc4.jar
 jnlp.indirect.jars=\
-    modules/ext/mysql-connector-java-5.1.18-bin.jar,\
-    modules/ext/postgresql-9.1-901.jdbc4.jar
+    modules/ext/mysql-connector-java-5.1.23-bin.jar,\
+    modules/ext/postgresql-9.2-1002.jdbc4.jar
diff --git a/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties b/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties
--- a/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties
+++ b/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties
@@ -46,5 +46,5 @@
 OpenIDE-Module-Short-Description=JDBC database drivers
 OpenIDE-Module-Long-Description=\
     <html>This plugin provides JDBC database drivers for an improved out-of-the-box experience when developing database applications. \
-    <p>The following drivers are included in this plugin: <ul> <li>MySQL Connector/J Version: 5.1.18</li> <li>PostgreSQL JDBC 4 Driver Version: 9.1-901</li> </ul> </p></html>
+    <p>The following drivers are included in this plugin: <ul> <li>MySQL Connector/J Version: 5.1.23</li> <li>PostgreSQL JDBC 4 Driver Version: 9.2-1002</li> </ul> </p></html>
 PostgreSQLDriver=PostgreSQL JDBC Driver
diff --git a/db.drivers/src/org/netbeans/modules/db/drivers/MySQLDriver.xml b/db.drivers/src/org/netbeans/modules/db/drivers/MySQLDriver.xml
--- a/db.drivers/src/org/netbeans/modules/db/drivers/MySQLDriver.xml
+++ b/db.drivers/src/org/netbeans/modules/db/drivers/MySQLDriver.xml
@@ -5,7 +5,7 @@
     <localizing-bundle>org.netbeans.modules.db.drivers.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
-        <resource>jar:nbinst://org.netbeans.modules.db.drivers/modules/ext/mysql-connector-java-5.1.18-bin.jar!/</resource>
+        <resource>jar:nbinst://org.netbeans.modules.db.drivers/modules/ext/mysql-connector-java-5.1.23-bin.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>
@@ -19,7 +19,7 @@
         <!-- please check with mkleint@netbeans.org before/after updating this or "classpath" section -->
         <property>
             <name>maven-dependencies</name>
-            <value>mysql:mysql-connector-java:5.1.18:jar</value>
+            <value>mysql:mysql-connector-java:5.1.23:jar</value>
         </property>
     </properties>
 </library>
diff --git a/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml b/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml
--- a/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml
+++ b/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml
@@ -5,7 +5,7 @@
     <localizing-bundle>org.netbeans.modules.db.drivers.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
-        <resource>jar:nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-9.1-901.jdbc4.jar!/</resource>
+        <resource>jar:nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-9.2-1002.jdbc4.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>
@@ -19,7 +19,7 @@
         <!-- please check with mkleint@netbeans.org before/after updating this or "classpath" section -->
         <property>
             <name>maven-dependencies</name>
-            <value>postgresql:postgresql:9.1-901.jdbc4:jar</value>
+            <value>postgresql:postgresql:9.2-1002.jdbc4:jar</value>
         </property>
     </properties>
 </library>
diff --git a/db.drivers/src/org/netbeans/modules/db/drivers/mysql.xml b/db.drivers/src/org/netbeans/modules/db/drivers/mysql.xml
--- a/db.drivers/src/org/netbeans/modules/db/drivers/mysql.xml
+++ b/db.drivers/src/org/netbeans/modules/db/drivers/mysql.xml
@@ -49,6 +49,6 @@
   <display-name value='MySQL (Connector/J driver)'/>
   <class value='com.mysql.jdbc.Driver'/>
   <urls>
-  	<url value="nbinst://org.netbeans.modules.db.drivers/modules/ext/mysql-connector-java-5.1.18-bin.jar"/>
+  	<url value="nbinst://org.netbeans.modules.db.drivers/modules/ext/mysql-connector-java-5.1.23-bin.jar"/>
   </urls>
 </driver>
diff --git a/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml b/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
--- a/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
+++ b/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
@@ -49,6 +49,6 @@
   <display-name value='PostgreSQL'/>
   <class value='org.postgresql.Driver'/>
   <urls>
-  	<url value="nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-9.1-901.jdbc4.jar"/>
+  	<url value="nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-9.2-1002.jdbc4.jar"/>
   </urls>
 </driver>