[nutch] branch master updated (b38077b -> 1130e68)

[sn...@apache.org]

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

snagel pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git.


    from b38077b  NUTCH-2632 protocol-okhttp doesn't accept proxy authentication - merge PR #375 from branch 'sjwoodard-master', contributed by Steven W.
     add 1f148ba  NUTCH-2621 Generate report of third-party licenses - add ant target `ant report-licenses` (for core and plugins)   which generates tabular reports of dependency licenses
     new 1130e68  Merge pull request #365 from sebastian-nagel/NUTCH-2621-3rd-party-license-report

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:
 build.xml                   |  8 +++++++-
 ivy/ivy-report-license.xsl  | 43 +++++++++++++++++++++++++++++++++++++++++++
 src/plugin/build-plugin.xml |  8 +++++++-
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 ivy/ivy-report-license.xsl

[nutch] 01/01: Merge pull request #365 from sebastian-nagel/NUTCH-2621-3rd-party-license-report

[sn...@apache.org]

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

snagel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git

commit 1130e684fb1b525b12eebc561b985466edd72168
Merge: b38077b 1f148ba
Author: Sebastian Nagel <sn...@apache.org>
AuthorDate: Fri Aug 17 11:59:50 2018 +0200

    Merge pull request #365 from sebastian-nagel/NUTCH-2621-3rd-party-license-report
    
    NUTCH-2621 Generate report of third-party licenses

 build.xml                   |  8 +++++++-
 ivy/ivy-report-license.xsl  | 43 +++++++++++++++++++++++++++++++++++++++++++
 src/plugin/build-plugin.xml |  8 +++++++-
 3 files changed, 57 insertions(+), 2 deletions(-)