This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 3354ccf577881ac8ac18e9e907b0f906f6c007f8
Merge: c451e08 d647a4f
Author: Jaroslav Tulach <jaroslav.tul...@oracle.com>
AuthorDate: Wed Jan 2 06:58:02 2019 +0100
Bringing Felix601 into the master
.travis.yml | 2 +-
.../src/org/netbeans/junit/MockServices.java | 6 +++++-
.../travis/check-line-endings.sh | 0
.../netbeans/core/netigso/EnabledAutoloadTest.java | 1 -
.../org/netbeans/core/netigso/IntegrationTest.java | 1 -
.../core/netigso/NetigsoUsesSwingTest.java | 1 -
.../src/org/netbeans/core/netigso/NetigsoUtil.java | 7 ------
platform/core.osgi/nbproject/project.properties | 4 ++--
platform/core.osgi/nbproject/project.xml | 8 -------
.../src/org/netbeans/core/osgi/OSGiRepository.java | 3 ---
platform/libs.felix/external/binaries-list | 2 +-
...txt => org.apache.felix.main-6.0.1-license.txt} | 4 ++--
....txt => org.apache.felix.main-6.0.1-notice.txt} | 0
platform/libs.felix/manifest.mf | 1 +
platform/libs.felix/nbproject/project.properties | 2 +-
platform/libs.felix/nbproject/project.xml | 4 ++--
platform/libs.osgi/build.xml | 25 ----------------------
platform/libs.osgi/external/binaries-list | 4 ++--
.../{osgi-5.0-license.txt => osgi-7.0-license.txt} | 6 +++---
platform/libs.osgi/manifest.mf | 2 +-
platform/libs.osgi/nbproject/project.properties | 4 ++--
platform/libs.osgi/nbproject/project.xml | 8 +++----
.../org/netbeans/modules/netbinox/Netbinox.java | 12 +++++++++++
23 files changed, 39 insertions(+), 68 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
