On Sat, Jan 27, 2018 at 3:20 PM, Matthias Bläsing <mblaes...@doppel-helix.eu > wrote:
> Hi Jan, > > Am Samstag, den 27.01.2018, 15:12 +0100 schrieb Jan Lahoda: > > > > Does this relate only to things we have in source, or also to external > > binaries? > > I'm only looking into the files in the repository. I'm touching the > CreateLicenseSummary and VerifyLibsAndLicenses tasks for this. > Cool. For the maven (and probably a few more similar jars), I so far also have a tweak for CreateLicenseSummary: --- diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java index da4f169..b4cef9b 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java @@ -253,9 +253,11 @@ public class CreateLicenseSummary extends Task { if (!innerName.endsWith(".jar") && !innerName.endsWith(".zip")) { continue; } + Map<String, String> nestedHeaders = binary2License.get(n + "!/" + innerName); + if (nestedHeaders == null) nestedHeaders = headers; is = zf.getInputStream(entry); try { - crc2LicenseHeaders.put(computeCRC32(is), headers); + crc2LicenseHeaders.put(computeCRC32(is), nestedHeaders); } finally { is.close(); } --- Would that fit into what you are doing? (The intent is basically to allow the -license.txt files to say something like: Files: apache-maven-3.3.9-bin.zip!/apache-maven-3.3.9/lib/jsr250-api-1.0.jar to refer to a file that is inside an external binary zip/jar. > > We are not attributing certain jars properly (e.g. some jars > > embedded in Apache Maven are not under Apache License 2.0, even though > our > > license file says so). So I was peeking at that a little (we could > enhance > > the *-license.txt format to also accept files from inside of jars, and > then > > it would hopefully all work OK). > > Sounds good - and good catch. > Actually, it was noted in one of the Justin's e-mails. Thanks, Jan > > Matthias > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org > For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org > > For further information about the NetBeans mailing lists, visit: > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists > > > >