You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2017/12/02 11:10:25 UTC
[incubator-netbeans] branch master updated (dfcc859 -> eda38dd)
This is an automated email from the ASF dual-hosted git repository.
geertjan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.
from dfcc859 Merge pull request #307 from steffendietz/autoupdate-services-test-data-rat-exclude
add 8d6244d NETBEANS-191: fixed reported license issues for Java Shell and Java Hints
add cc6d6c7 Merge fixes with master into sdedic/fix-javashell-licenses
new eda38dd Merge pull request #312 from sdedic/sdedic/fix-javashell-licenses
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:
.../modules/jshell/support/ContentParserTest.java | 9 +++++++++
.../org/netbeans/modules/jshell/support/reploutput.txt | 16 ++++++++++++++++
.../modules/jshell/support/reploutput_golden.txt | 16 ++++++++++++++++
lib.jshell.agent/nbproject/project.properties | 2 +-
libs.jshell.compile/external/binaries-list | 2 +-
.../{nb-jshell-license.txt => jshell-9-license.txt} | 5 +++--
libs.jshell.compile/nbproject/project.xml | 2 +-
nbbuild/build.xml | 1 -
8 files changed, 47 insertions(+), 6 deletions(-)
rename libs.jshell.compile/external/{nb-jshell-license.txt => jshell-9-license.txt} (99%)
--
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 #312 from
sdedic/sdedic/fix-javashell-licenses
Posted by ge...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
geertjan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit eda38dd5154db27bd9b7b21b033cd885f8e0c8be
Merge: dfcc859 cc6d6c7
Author: Geertjan Wielenga <ge...@oracle.com>
AuthorDate: Sat Dec 2 12:10:22 2017 +0100
Merge pull request #312 from sdedic/sdedic/fix-javashell-licenses
Javashell fixes
.../modules/jshell/support/ContentParserTest.java | 9 +++++++++
.../org/netbeans/modules/jshell/support/reploutput.txt | 16 ++++++++++++++++
.../modules/jshell/support/reploutput_golden.txt | 16 ++++++++++++++++
lib.jshell.agent/nbproject/project.properties | 2 +-
libs.jshell.compile/external/binaries-list | 2 +-
.../{nb-jshell-license.txt => jshell-9-license.txt} | 5 +++--
libs.jshell.compile/nbproject/project.xml | 2 +-
nbbuild/build.xml | 1 -
8 files changed, 47 insertions(+), 6 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.