You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/09/24 19:52:48 UTC
[GitHub] asfgit closed pull request #900: [NETBEANS-870] Upgrade PostgreSQL
driver to version 42.2.5.
asfgit closed pull request #900: [NETBEANS-870] Upgrade PostgreSQL driver to version 42.2.5.
URL: https://github.com/apache/incubator-netbeans/pull/900
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ide/db.drivers/external/binaries-list b/ide/db.drivers/external/binaries-list
index 2bf0f99621..7cbc2d1927 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.
-7F25826357976ED495184938B6A464ACDF0EA3F8 org.postgresql:postgresql:9.4.1209
+951B7EDA125F3137538A94E2CBDCF744088AD4C2 org.postgresql:postgresql:42.2.5
\ No newline at end of file
diff --git a/ide/db.drivers/external/postgresql-9.4.1209-license.txt b/ide/db.drivers/external/postgresql-42.2.5-license.txt
similarity index 81%
rename from ide/db.drivers/external/postgresql-9.4.1209-license.txt
rename to ide/db.drivers/external/postgresql-42.2.5-license.txt
index 42cd6b4ac6..6f9cb612a5 100644
--- a/ide/db.drivers/external/postgresql-9.4.1209-license.txt
+++ b/ide/db.drivers/external/postgresql-42.2.5-license.txt
@@ -1,13 +1,12 @@
Name: PostgreSQL JDBC Driver
-Version: 9.4.1209
+Version: 42.2.5
Description: Allows Java programs to interact with a PostgreSQL database
License: BSD-postgresql
-OSR: 7016
Origin: https://jdbc.postgresql.org/about/license.html
-Files: postgresql-9.4.1209.jar
+Files: postgresql-42.2.5.jar
Comment: Out-of-the-box support for Postgres Java database applications
-Copyright (c) 1997-2011, PostgreSQL Global Development Group
+Copyright (c) 1997, PostgreSQL Global Development Group
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -18,9 +17,6 @@ modification, are permitted provided that the following conditions are met:
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
diff --git a/ide/db.drivers/nbproject/project.properties b/ide/db.drivers/nbproject/project.properties
index b85f852f2a..a1c3a35eb0 100644
--- a/ide/db.drivers/nbproject/project.properties
+++ b/ide/db.drivers/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
-release.external/postgresql-9.4.1209.jar=modules/ext/postgresql-9.4.1209.jar
+javac.source=1.8
+release.external/postgresql-42.2.5.jar=modules/ext/postgresql-42.2.5.jar
jnlp.indirect.jars=\
- modules/ext/postgresql-9.4.1209.jar
+ modules/ext/postgresql-42.2.5.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 cf96f315b3..60d7bbeef0 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
@@ -15,11 +15,11 @@
# specific language governing permissions and limitations
# under the License.
-MySQLDriver=MySQL JDBC Driver
OpenIDE-Module-Name=Database Drivers
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 drivers are included in this plugin: <ul> <li>MySQL Connector/J Version: 5.1.23</li> <li>PostgreSQL JDBC 4 Driver Version: 9.4.1209</li> </ul> </p></html>
+ <p>The following driver is included in this plugin: <ul> <li>PostgreSQL JDBC 4.2 Driver Version: 42.2.5</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 8f0cdc1ccb..211efc45d8 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-9.4.1209.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-42.2.5.jar!/</resource>
</volume>
<volume>
<type>src</type>
@@ -39,7 +39,7 @@
<!-- please check with mkleint@netbeans.org before/after updating this or "classpath" section -->
<property>
<name>maven-dependencies</name>
- <value>org.postgresql:postgresql:9.4.1209:jar</value>
+ <value>org.postgresql:postgresql-42.2.5: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/postgresql.xml
index a6d7a11c79..832bd34ef1 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-9.4.1209.jar"/>
+ <url value="nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-42.2.5.jar"/>
</urls>
</driver>
diff --git a/nbbuild/licenses/BSD-postgresql b/nbbuild/licenses/BSD-postgresql
index fd416d2ec4..5d3a0018c7 100644
--- a/nbbuild/licenses/BSD-postgresql
+++ b/nbbuild/licenses/BSD-postgresql
@@ -1,4 +1,4 @@
-Copyright (c) 1997-2011, PostgreSQL Global Development Group
+Copyright (c) 1997, PostgreSQL Global Development Group
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -9,9 +9,6 @@ modification, are permitted provided that the following conditions are met:
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
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists