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 db285ccde43869c5e688357e4ff9842f2b0fc7f3 Merge: 331ac2a 9b819cf Author: Geertjan Wielenga <geertjan.wiele...@oracle.com> AuthorDate: Fri May 11 20:28:24 2018 +0200 Merge pull request #520 from jlahoda/NETBEANS-317-jsch-jzlib [NETBEANS-317] Ensuring that jars that are augmented with OSGi metada… c.jcraft.jsch/build.xml | 4 +- c.jcraft.jzlib/build.xml | 4 +- .../org/netbeans/nbbuild/FileCRC32Calculator.java | 60 ++++++ .../nbbuild/extlibs/CreateLicenseSummary.java | 89 ++++++--- nbbuild/templates/projectized.xml | 4 + o.apache.commons.codec/build.xml | 4 +- o.apache.commons.httpclient/build.xml | 4 +- o.apache.commons.logging/build.xml | 4 +- o.apache.ws.commons.util/build.xml | 4 +- o.apache.xmlrpc/build.xml | 4 +- ...ient-3.0-license.txt => xmlrpc-3.0-license.txt} | 1 + .../external/xmlrpc-common-3.0-license.txt | 208 --------------------- .../external/xmlrpc-server-3.0-license.txt | 208 --------------------- 13 files changed, 147 insertions(+), 451 deletions(-) -- To stop receiving notification emails like this one, please contact geert...@apache.org. --------------------------------------------------------------------- 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