From 124ea3c6c6e4b4fea055a1ee70abad1e0a7f5541 Mon Sep 17 00:00:00 2001 From: Jan Lahoda Date: Mon, 5 Jul 2021 05:33:55 +0200 Subject: [PATCH] Fixing overlaps --- .../org/netbeans/nbbuild/extlibs/ignored-binary-overlaps | 3 --- nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps index 56f33cf3ec5e..f869ca24a73d 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps @@ -57,6 +57,3 @@ enterprise/modules/ext/javaee7-endorsed/jsr181-api.jar java/modules/ext/jaxws22/ # maven needs commons-lang internally ide/modules/org-apache-commons-lang.jar java/maven/lib/commons-lang-2.6.jar - -# not part of the product: -harness/apisupport.harness/external/launcher-12.5-distribution.zip platform/o.n.bootstrap/external/launcher-12.5-distribution.zip diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 9405ec616559..be774ee59cb4 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -110,3 +110,6 @@ webcommon/javascript2.doc/external/testfiles-jsdoc-1.zip webcommon/javascript2.e webcommon/javascript2.editor/external/testfiles-jsdoc-1.zip webcommon/javascript2.extdoc/external/testfiles-jsdoc-1.zip are identical webcommon/javascript2.extdoc/external/testfiles-jsdoc-1.zip webcommon/javascript2.jsdoc/external/testfiles-jsdoc-1.zip are identical webcommon/javascript2.jsdoc/external/testfiles-jsdoc-1.zip webcommon/javascript2.sdoc/external/testfiles-jsdoc-1.zip are identical + +# not part of the product: +harness/apisupport.harness/external/launcher-12.5-distribution.zip platform/o.n.bootstrap/external/launcher-12.5-distribution.zip