You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/11/27 18:21:01 UTC

[incubator-netbeans] branch master updated (61e380e -> 6e8390d)

This is an automated email from the ASF dual-hosted git repository.

matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.


    from 61e380e  Merge pull request #258 from dtrebbien/fix-271736-wrong-not-used-hint
     add 6e6aa5a  Build derby sample DB from source instead of downloading prebuild binary
     add becb368  [NETBEANS-70] Remove bundled mysql driver (GPL licensed)
     new 6e8390d  Merge pull request #294 from matthiasblaesing/db-clean-external-gpl

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 db.drivers/external/binaries-list                  |   1 -
 .../mysql-connector-java-5.1.23-license.txt        | 349 ---------------------
 db.drivers/nbproject/project.properties            |   2 -
 .../netbeans/modules/db/drivers/MySQLDriver.xml    |  45 ---
 .../src/org/netbeans/modules/db/drivers/layer.xml  |   3 -
 .../src/org/netbeans/modules/db/drivers/mysql.xml  |   3 -
 derby/build.xml                                    |  27 ++
 derby/external/binaries-list                       |   3 +-
 .../external/derby-10.14.1.0-license.txt           |  12 +-
 derby/nbproject/project.properties                 |   2 +-
 .../modules/derby/api/DerbyDatabasesTest.java      |   3 +-
 11 files changed, 39 insertions(+), 411 deletions(-)
 delete mode 100644 db.drivers/external/mysql-connector-java-5.1.23-license.txt
 delete mode 100644 db.drivers/src/org/netbeans/modules/db/drivers/MySQLDriver.xml
 copy db/external/derby-10.2.2.0-license.txt => derby/external/derby-10.14.1.0-license.txt (97%)

-- 
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].

[incubator-netbeans] 01/01: Merge pull request #294 from matthiasblaesing/db-clean-external-gpl

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git

commit 6e8390d1a894864dcdbb6618f9d97b5315d31d75
Merge: 61e380e becb368
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Mon Nov 27 19:20:58 2017 +0100

    Merge pull request #294 from matthiasblaesing/db-clean-external-gpl
    
     [NETBEANS-70] Remove bundled mysql driver (GPL licensed) and build sampledb from source

 db.drivers/external/binaries-list                  |   1 -
 .../mysql-connector-java-5.1.23-license.txt        | 349 ---------------------
 db.drivers/nbproject/project.properties            |   2 -
 .../netbeans/modules/db/drivers/MySQLDriver.xml    |  45 ---
 .../src/org/netbeans/modules/db/drivers/layer.xml  |   3 -
 .../src/org/netbeans/modules/db/drivers/mysql.xml  |   3 -
 derby/build.xml                                    |  27 ++
 derby/external/binaries-list                       |   3 +-
 derby/external/derby-10.14.1.0-license.txt         | 210 +++++++++++++
 derby/nbproject/project.properties                 |   2 +-
 .../modules/derby/api/DerbyDatabasesTest.java      |   3 +-
 11 files changed, 242 insertions(+), 406 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.