This is an automated email from the ASF dual-hosted git repository.
pepness pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 9cbb0c6143 Upgrade PostgreSQL JDBC driver to 42.5.4 (#5657)
9cbb0c6143 is described below
commit 9cbb0c6143c30950abbb957708f6644a7f78297a
Author: José Contreras <[email protected]>
AuthorDate: Mon Mar 13 10:05:37 2023 -0600
Upgrade PostgreSQL JDBC driver to 42.5.4 (#5657)
- Add more JDBC database driver templates
---
ide/db.drivers/external/binaries-list | 2 +-
...tgresql-42.2.16-license.txt => postgresql-42.5.4-license.txt} | 4 ++--
ide/db.drivers/nbproject/project.properties | 4 ++--
.../src/org/netbeans/modules/db/drivers/Bundle.properties | 2 +-
.../src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml | 4 ++--
.../org/netbeans/modules/db/drivers/{postgresql.xml => db2.xml} | 9 +++------
.../netbeans/modules/db/drivers/{postgresql.xml => informix.xml} | 9 +++------
ide/db.drivers/src/org/netbeans/modules/db/drivers/layer.xml | 8 ++++++--
.../netbeans/modules/db/drivers/{postgresql.xml => mariadb.xml} | 9 +++------
.../netbeans/modules/db/drivers/{postgresql.xml => mssql.xml} | 9 +++------
.../src/org/netbeans/modules/db/drivers/postgresql.xml | 2 +-
11 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/ide/db.drivers/external/binaries-list
b/ide/db.drivers/external/binaries-list
index c427258036..b9ffa6b33a 100644
--- a/ide/db.drivers/external/binaries-list
+++ b/ide/db.drivers/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-A9EE12F737BD5DC7D046E4C065E391D38D6A3CFC org.postgresql:postgresql:42.2.16
+015015A54F15E340A9A8A6A2C5457429CB1176B8 org.postgresql:postgresql:42.5.4
diff --git a/ide/db.drivers/external/postgresql-42.2.16-license.txt
b/ide/db.drivers/external/postgresql-42.5.4-license.txt
similarity index 97%
rename from ide/db.drivers/external/postgresql-42.2.16-license.txt
rename to ide/db.drivers/external/postgresql-42.5.4-license.txt
index d9498c7c8e..a286b5444e 100644
--- a/ide/db.drivers/external/postgresql-42.2.16-license.txt
+++ b/ide/db.drivers/external/postgresql-42.5.4-license.txt
@@ -1,9 +1,9 @@
Name: PostgreSQL JDBC Driver
-Version: 42.2.16
+Version: 42.5.4
Description: Allows Java programs to interact with a PostgreSQL database
License: BSD-postgresql
Origin: https://jdbc.postgresql.org/about/license.html
-Files: postgresql-42.2.16.jar
+Files: postgresql-42.5.4.jar
Comment: Out-of-the-box support for Postgres Java database applications
Copyright (c) 1997, PostgreSQL Global Development Group
diff --git a/ide/db.drivers/nbproject/project.properties
b/ide/db.drivers/nbproject/project.properties
index ab9e9e2906..a393a8d8b8 100644
--- a/ide/db.drivers/nbproject/project.properties
+++ b/ide/db.drivers/nbproject/project.properties
@@ -17,6 +17,6 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-release.external/postgresql-42.2.16.jar=modules/ext/postgresql-42.2.16.jar
+release.external/postgresql-42.5.4.jar=modules/ext/postgresql-42.5.4.jar
jnlp.indirect.jars=\
- modules/ext/postgresql-42.2.16.jar
+ modules/ext/postgresql-42.5.4.jar
diff --git
a/ide/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties
b/ide/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties
index 40f444de94..a0b91ac727 100644
--- a/ide/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties
+++ b/ide/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties
@@ -20,6 +20,6 @@ OpenIDE-Module-Display-Category=Database
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 driver is included in this plugin: <ul> <li>PostgreSQL
JDBC 4.2 Driver Version: 42.2.16</li> </ul> </p></html>
+ <p>The following driver is included in this plugin: <ul> <li>PostgreSQL
JDBC 4.2 Driver Version: 42.5.4</li> </ul> </p></html>
PostgreSQLDriver=PostgreSQL JDBC Driver
MySQLDriver=MySQL JDBC Driver
diff --git
a/ide/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml
b/ide/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml
index 54056b05c1..47296e1af0 100644
--- a/ide/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml
+++ b/ide/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml
@@ -25,7 +25,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-42.2.16.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-42.5.4.jar!/</resource>
</volume>
<volume>
<type>src</type>
@@ -38,7 +38,7 @@
<properties>
<property>
<name>maven-dependencies</name>
- <value>org.postgresql:postgresql:42.2.16:jar</value>
+ <value>org.postgresql:postgresql:42.5.4:jar</value>
</property>
</properties>
</library>
diff --git a/ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
b/ide/db.drivers/src/org/netbeans/modules/db/drivers/db2.xml
similarity index 81%
copy from ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
copy to ide/db.drivers/src/org/netbeans/modules/db/drivers/db2.xml
index 6247279afa..96a02f578e 100644
--- a/ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
+++ b/ide/db.drivers/src/org/netbeans/modules/db/drivers/db2.xml
@@ -21,10 +21,7 @@
-->
<!DOCTYPE driver PUBLIC '-//NetBeans//DTD JDBC Driver 1.1//EN'
'http://www.netbeans.org/dtds/jdbc-driver-1_1.dtd'>
<driver>
- <name value='Postgres'/>
- <display-name value='PostgreSQL'/>
- <class value='org.postgresql.Driver'/>
- <urls>
- <url
value="nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-42.2.16.jar"/>
- </urls>
+ <name value='IBMDb2'/>
+ <display-name value='IBM DB2 Universal Driver'/>
+ <class value='com.ibm.db2.jcc.DB2Driver'/>
</driver>
diff --git a/ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
b/ide/db.drivers/src/org/netbeans/modules/db/drivers/informix.xml
similarity index 81%
copy from ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
copy to ide/db.drivers/src/org/netbeans/modules/db/drivers/informix.xml
index 6247279afa..94ba9b24e7 100644
--- a/ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
+++ b/ide/db.drivers/src/org/netbeans/modules/db/drivers/informix.xml
@@ -21,10 +21,7 @@
-->
<!DOCTYPE driver PUBLIC '-//NetBeans//DTD JDBC Driver 1.1//EN'
'http://www.netbeans.org/dtds/jdbc-driver-1_1.dtd'>
<driver>
- <name value='Postgres'/>
- <display-name value='PostgreSQL'/>
- <class value='org.postgresql.Driver'/>
- <urls>
- <url
value="nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-42.2.16.jar"/>
- </urls>
+ <name value='IBMInformix'/>
+ <display-name value='Informix Dynamic Server'/>
+ <class value='com.informix.jdbc.IfxDriver'/>
</driver>
diff --git a/ide/db.drivers/src/org/netbeans/modules/db/drivers/layer.xml
b/ide/db.drivers/src/org/netbeans/modules/db/drivers/layer.xml
index 4911630d50..834bcd1930 100644
--- a/ide/db.drivers/src/org/netbeans/modules/db/drivers/layer.xml
+++ b/ide/db.drivers/src/org/netbeans/modules/db/drivers/layer.xml
@@ -23,9 +23,13 @@
<filesystem>
<folder name="Databases">
<folder name="JDBCDrivers">
- <file name="oracle_thin.xml" url="oracle_thin.xml"/>
- <file name="oracle_oci.xml" url="oracle_oci.xml"/>
+ <file name="db2.xml" url="db2.xml"/>
+ <file name="informix.xml" url="informix.xml"/>
+ <file name="mariadb.xml" url="mariadb.xml"/>
+ <file name="mssql.xml" url="mssql.xml"/>
<file name="mysql.xml" url="mysql.xml"/>
+ <file name="oracle_oci.xml" url="oracle_oci.xml"/>
+ <file name="oracle_thin.xml" url="oracle_thin.xml"/>
<file name="postgresql.xml" url="postgresql.xml"/>
</folder>
</folder>
diff --git a/ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
b/ide/db.drivers/src/org/netbeans/modules/db/drivers/mariadb.xml
similarity index 81%
copy from ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
copy to ide/db.drivers/src/org/netbeans/modules/db/drivers/mariadb.xml
index 6247279afa..cf275d4b0f 100644
--- a/ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
+++ b/ide/db.drivers/src/org/netbeans/modules/db/drivers/mariadb.xml
@@ -21,10 +21,7 @@
-->
<!DOCTYPE driver PUBLIC '-//NetBeans//DTD JDBC Driver 1.1//EN'
'http://www.netbeans.org/dtds/jdbc-driver-1_1.dtd'>
<driver>
- <name value='Postgres'/>
- <display-name value='PostgreSQL'/>
- <class value='org.postgresql.Driver'/>
- <urls>
- <url
value="nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-42.2.16.jar"/>
- </urls>
+ <name value='MariaDB'/>
+ <display-name value='MariaDB (MySQL-compatible)'/>
+ <class value='org.mariadb.jdbc.Driver'/>
</driver>
diff --git a/ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
b/ide/db.drivers/src/org/netbeans/modules/db/drivers/mssql.xml
similarity index 81%
copy from ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
copy to ide/db.drivers/src/org/netbeans/modules/db/drivers/mssql.xml
index 6247279afa..bd1566d4b9 100644
--- a/ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
+++ b/ide/db.drivers/src/org/netbeans/modules/db/drivers/mssql.xml
@@ -21,10 +21,7 @@
-->
<!DOCTYPE driver PUBLIC '-//NetBeans//DTD JDBC Driver 1.1//EN'
'http://www.netbeans.org/dtds/jdbc-driver-1_1.dtd'>
<driver>
- <name value='Postgres'/>
- <display-name value='PostgreSQL'/>
- <class value='org.postgresql.Driver'/>
- <urls>
- <url
value="nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-42.2.16.jar"/>
- </urls>
+ <name value='MSSQL'/>
+ <display-name value='Microsoft SQL Server'/>
+ <class value='com.microsoft.jdbc.sqlserver.SQLServerDriver'/>
</driver>
diff --git a/ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
b/ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
index 6247279afa..8edb0d1ab9 100644
--- a/ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
+++ b/ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml
@@ -25,6 +25,6 @@
<display-name value='PostgreSQL'/>
<class value='org.postgresql.Driver'/>
<urls>
- <url
value="nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-42.2.16.jar"/>
+ <url
value="nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-42.5.4.jar"/>
</urls>
</driver>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
