diff --git a/harness/apisupport.harness/external/binaries-list b/harness/apisupport.harness/external/binaries-list index 5cb8ec83fbfd..a5b58853b0fb 100644 --- a/harness/apisupport.harness/external/binaries-list +++ b/harness/apisupport.harness/external/binaries-list @@ -20,4 +20,4 @@ # D4EF66C1CC8A5B3C97E0CC7C210227AAEC1F1086 jsearch-2.0_05.jar A806D99716C5E9441BFD8B401176FDDEFC673022 bindex-2.2.jar 6FF4C411EE231AB8042C9047373F87FC64D0299D harness-launchers-8.2.zip -1D8777C057A3CFE0EE5A9E2BC7DF73BEC967E730 https://archive.apache.org/dist/netbeans/native/netbeans-launchers/3-282bbc032bcd/launcher-external-binaries-3-282bbc032bcd.zip launcher-external-binaries-3-282bbc032bcd.zip +4932AC2C37141B459EAB30B8F00EF69E73134D07 https://archive.apache.org/dist/netbeans/native/netbeans-launchers/4-8e2bc77e581e/launcher-external-binaries-4-8e2bc77e581e.zip launcher-external-binaries-4-8e2bc77e581e.zip diff --git a/harness/apisupport.harness/external/launcher-external-binaries-3-282bbc032bcd-license.txt b/harness/apisupport.harness/external/launcher-external-binaries-4-8e2bc77e581e-license.txt similarity index 99% rename from harness/apisupport.harness/external/launcher-external-binaries-3-282bbc032bcd-license.txt rename to harness/apisupport.harness/external/launcher-external-binaries-4-8e2bc77e581e-license.txt index ab6af637ef4a..53c023c8e155 100644 --- a/harness/apisupport.harness/external/launcher-external-binaries-3-282bbc032bcd-license.txt +++ b/harness/apisupport.harness/external/launcher-external-binaries-4-8e2bc77e581e-license.txt @@ -1,6 +1,6 @@ Name: NetBeans Application Launchers Description: Windows Launchers for NetBeans Applications -Version: 3-282bbc032bcd +Version: 4-8e2bc77e581e License: Apache-2.0 Source: https://netbeans.org/ Origin: NetBeans diff --git a/harness/apisupport.harness/nbproject/project.properties b/harness/apisupport.harness/nbproject/project.properties index d78afca9b3c9..ca593b9ca344 100644 --- a/harness/apisupport.harness/nbproject/project.properties +++ b/harness/apisupport.harness/nbproject/project.properties @@ -30,8 +30,8 @@ release.../../nbbuild/jdk.xml=jdk.xml # release.external/jsearch-2.0_05.jar=antlib/jsearch-2.0_05.jar release.external/bindex-2.2.jar=antlib/bindex-2.2.jar #release.external/jnlp-servlet.jar=jnlp/jnlp-servlet.jar -release.external/launcher-external-binaries-3-282bbc032bcd.zip!/app.exe=launchers/app.exe -release.external/launcher-external-binaries-3-282bbc032bcd.zip!/app64.exe=launchers/app64.exe +release.external/launcher-external-binaries-4-8e2bc77e581e.zip!/app.exe=launchers/app.exe +release.external/launcher-external-binaries-4-8e2bc77e581e.zip!/app64.exe=launchers/app64.exe release.external/harness-launchers-8.2.zip!/pre7_app.exe=launchers/pre7_app.exe release.external/harness-launchers-8.2.zip!/pre7_app_w.exe=launchers/pre7_app_w.exe nbm.executable.files=launchers/app.sh diff --git a/nb/ide.launcher/external/binaries-list b/nb/ide.launcher/external/binaries-list index ff5d89b69d30..b762b45423cc 100644 --- a/nb/ide.launcher/external/binaries-list +++ b/nb/ide.launcher/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -1D8777C057A3CFE0EE5A9E2BC7DF73BEC967E730 https://archive.apache.org/dist/netbeans/native/netbeans-launchers/3-282bbc032bcd/launcher-external-binaries-3-282bbc032bcd.zip launcher-external-binaries-3-282bbc032bcd.zip +4932AC2C37141B459EAB30B8F00EF69E73134D07 https://archive.apache.org/dist/netbeans/native/netbeans-launchers/4-8e2bc77e581e/launcher-external-binaries-4-8e2bc77e581e.zip launcher-external-binaries-4-8e2bc77e581e.zip diff --git a/nb/ide.launcher/external/launcher-external-binaries-3-282bbc032bcd-license.txt b/nb/ide.launcher/external/launcher-external-binaries-4-8e2bc77e581e-license.txt similarity index 99% rename from nb/ide.launcher/external/launcher-external-binaries-3-282bbc032bcd-license.txt rename to nb/ide.launcher/external/launcher-external-binaries-4-8e2bc77e581e-license.txt index ab6af637ef4a..53c023c8e155 100644 --- a/nb/ide.launcher/external/launcher-external-binaries-3-282bbc032bcd-license.txt +++ b/nb/ide.launcher/external/launcher-external-binaries-4-8e2bc77e581e-license.txt @@ -1,6 +1,6 @@ Name: NetBeans Application Launchers Description: Windows Launchers for NetBeans Applications -Version: 3-282bbc032bcd +Version: 4-8e2bc77e581e License: Apache-2.0 Source: https://netbeans.org/ Origin: NetBeans diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries index 8974c92f4c34..17a7c7a70c72 100644 --- 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/launcher-external-binaries-3-282bbc032bcd.zip +nb/ide.launcher/external/launcher-external-binaries-4-8e2bc77e581e.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-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index ba154bf49791..c8aa1c6eb98d 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -86,10 +86,10 @@ webcommon/javascript2.extdoc/external/testfiles-jsdoc-1.zip webcommon/javascript webcommon/javascript2.jsdoc/external/testfiles-jsdoc-1.zip webcommon/javascript2.sdoc/external/testfiles-jsdoc-1.zip # not part of the product: -harness/apisupport.harness/external/launcher-external-binaries-3-282bbc032bcd.zip platform/o.n.bootstrap/external/launcher-external-binaries-3-282bbc032bcd.zip -harness/apisupport.harness/external/launcher-external-binaries-3-282bbc032bcd.zip nb/ide.launcher/external/launcher-external-binaries-3-282bbc032bcd.zip -nb/ide.launcher/external/launcher-external-binaries-3-282bbc032bcd.zip platform/o.n.bootstrap/external/launcher-external-binaries-3-282bbc032bcd.zip -nb/ide.launcher/external/launcher-external-binaries-3-282bbc032bcd.zip harness/apisupport.harness/external/launcher-external-binaries-3-282bbc032bcd.zip +harness/apisupport.harness/external/launcher-external-binaries-4-8e2bc77e581e.zip platform/o.n.bootstrap/external/launcher-external-binaries-4-8e2bc77e581e.zip +harness/apisupport.harness/external/launcher-external-binaries-4-8e2bc77e581e.zip nb/ide.launcher/external/launcher-external-binaries-4-8e2bc77e581e.zip +nb/ide.launcher/external/launcher-external-binaries-4-8e2bc77e581e.zip platform/o.n.bootstrap/external/launcher-external-binaries-4-8e2bc77e581e.zip +nb/ide.launcher/external/launcher-external-binaries-4-8e2bc77e581e.zip harness/apisupport.harness/external/launcher-external-binaries-4-8e2bc77e581e.zip # only one is part of the product: java/libs.javacapi/external/nb-javac-jdk-25+31.1-api.jar java/libs.nbjavacapi/external/nb-javac-jdk-25+31.1-api.jar diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 43589655979b..7f4099c77b3b 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -460,14 +460,13 @@ metabuild.hash=${metabuild.hash} - - + diff --git a/platform/o.n.bootstrap/external/binaries-list b/platform/o.n.bootstrap/external/binaries-list index ff5d89b69d30..b762b45423cc 100644 --- a/platform/o.n.bootstrap/external/binaries-list +++ b/platform/o.n.bootstrap/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -1D8777C057A3CFE0EE5A9E2BC7DF73BEC967E730 https://archive.apache.org/dist/netbeans/native/netbeans-launchers/3-282bbc032bcd/launcher-external-binaries-3-282bbc032bcd.zip launcher-external-binaries-3-282bbc032bcd.zip +4932AC2C37141B459EAB30B8F00EF69E73134D07 https://archive.apache.org/dist/netbeans/native/netbeans-launchers/4-8e2bc77e581e/launcher-external-binaries-4-8e2bc77e581e.zip launcher-external-binaries-4-8e2bc77e581e.zip diff --git a/platform/o.n.bootstrap/external/launcher-external-binaries-3-282bbc032bcd-license.txt b/platform/o.n.bootstrap/external/launcher-external-binaries-4-8e2bc77e581e-license.txt similarity index 99% rename from platform/o.n.bootstrap/external/launcher-external-binaries-3-282bbc032bcd-license.txt rename to platform/o.n.bootstrap/external/launcher-external-binaries-4-8e2bc77e581e-license.txt index ab6af637ef4a..53c023c8e155 100644 --- a/platform/o.n.bootstrap/external/launcher-external-binaries-3-282bbc032bcd-license.txt +++ b/platform/o.n.bootstrap/external/launcher-external-binaries-4-8e2bc77e581e-license.txt @@ -1,6 +1,6 @@ Name: NetBeans Application Launchers Description: Windows Launchers for NetBeans Applications -Version: 3-282bbc032bcd +Version: 4-8e2bc77e581e License: Apache-2.0 Source: https://netbeans.org/ Origin: NetBeans diff --git a/platform/o.n.bootstrap/nbproject/project.properties b/platform/o.n.bootstrap/nbproject/project.properties index 7d85c8c0aee6..cdc58b079c68 100644 --- a/platform/o.n.bootstrap/nbproject/project.properties +++ b/platform/o.n.bootstrap/nbproject/project.properties @@ -20,10 +20,10 @@ javac.release=11 module.jar.dir=lib module.jar.basename=boot.jar release.launcher/unix/nbexec=lib/nbexec -release.external/launcher-external-binaries-3-282bbc032bcd.zip!/nbexec.exe=lib/nbexec.exe -release.external/launcher-external-binaries-3-282bbc032bcd.zip!/nbexec64.exe=lib/nbexec64.exe -release.external/launcher-external-binaries-3-282bbc032bcd.zip!/nbexec.dll=lib/nbexec.dll -release.external/launcher-external-binaries-3-282bbc032bcd.zip!/nbexec64.dll=lib/nbexec64.dll +release.external/launcher-external-binaries-4-8e2bc77e581e.zip!/nbexec.exe=lib/nbexec.exe +release.external/launcher-external-binaries-4-8e2bc77e581e.zip!/nbexec64.exe=lib/nbexec64.exe +release.external/launcher-external-binaries-4-8e2bc77e581e.zip!/nbexec.dll=lib/nbexec.dll +release.external/launcher-external-binaries-4-8e2bc77e581e.zip!/nbexec64.dll=lib/nbexec64.dll nbm.executable.files=lib/nbexec javadoc.arch=${basedir}/arch.xml