Fixing tests.

jlahoda · Jul 4, 2021 · 1e3b98f · 1e3b98f
1 parent a482788
commit 1e3b98f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 37 deletions.
diff --git a/harness/apisupport.harness/licenseinfo.xml b/harness/apisupport.harness/licenseinfo.xml
@@ -22,7 +22,6 @@
 <licenseinfo>
     <fileset>
         <file>release/etc/applicationIcon.icns</file>
-        <file>windows-launcher-src/app.ico</file>
         <license ref="Apache-2.0-ASF" />
         <comment type="COMMENT_UNSUPPORTED" />
     </fileset>

diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
@@ -63,7 +63,7 @@ extide/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.jar
 extide/gradle/release/modules/gradle/netbeans-gradle-tooling.jar
 
 # ide.launcher is a special semi-module, does not have nbproject/project.xml, so is not recognized:
-nb/ide.launcher/external/launchers-10.0.zip
+nb/ide.launcher/external/launcher-12.5-distribution.zip
 
 # webcommon/libs.oracle.jsparser builds a test-only binaries into build/webcommon. Not distributed.
 contrib/libs.oracle.jsparser/build/webcommon/**

diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps
@@ -56,4 +56,7 @@ enterprise/modules/ext/javaee7-endorsed/jaxws-api.jar java/modules/ext/jaxws22/a
 enterprise/modules/ext/javaee7-endorsed/jsr181-api.jar java/modules/ext/jaxws22/api/jsr181-api.jar
 
 # maven needs commons-lang internally
-ide/modules/org-apache-commons-lang.jar java/maven/lib/commons-lang-2.6.jar
+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/platform/o.n.bootstrap/licenseinfo.xml b/platform/o.n.bootstrap/licenseinfo.xml