From 442167363341c8afb7aed536dcccf4a7d44a61c2 Mon Sep 17 00:00:00 2001 From: Eric Barboni Date: Mon, 5 Oct 2026 16:42:01 +0200 Subject: [PATCH] update Apache RAT 0.15 to 0.18 --- .../org/netbeans/nbbuild/RatReportTask.java | 4 ++-- nbbuild/build.xml | 18 +++--------------- ...license.txt => apache-rat-0.18-license.txt} | 2 +- nbbuild/external/binaries-list | 2 +- nbbuild/rat-exclusions.txt | 5 +++++ 5 files changed, 12 insertions(+), 19 deletions(-) rename nbbuild/external/{apache-rat-0.15-license.txt => apache-rat-0.18-license.txt} (99%) diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java b/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java index 88ab551c5022..7d1bc48a3fa9 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java +++ b/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java @@ -233,7 +233,7 @@ private static String writeFiles(Set listFile, String repo) { } private void doPopulateUnapproved(Map moduleRATInfo, Element rootElement, XPath path) throws XPathExpressionException { - NodeList evaluate = (NodeList) path.evaluate("descendant::resource[license-approval/@name=\"false\"]", rootElement, XPathConstants.NODESET); + NodeList evaluate = (NodeList) path.evaluate("descendant::resource[license/@approval=\"false\"]", rootElement, XPathConstants.NODESET); for (int i = 0; i < evaluate.getLength(); i++) { String resources = relativize(evaluate.item(i).getAttributes().getNamedItem("name").getTextContent()); String moduleName = getModuleName(resources); @@ -246,7 +246,7 @@ private void doPopulateUnapproved(Map moduleRATInfo, Element } private void doPopulateApproved(Map moduleRATInfo, Element rootElement, XPath path) throws XPathExpressionException { - NodeList evaluate = (NodeList) path.evaluate("descendant::resource[license-approval/@name=\"true\"]", rootElement, XPathConstants.NODESET); + NodeList evaluate = (NodeList) path.evaluate("descendant::resource[license/@approval=\"true\"]", rootElement, XPathConstants.NODESET); for (int i = 0; i < evaluate.getLength(); i++) { String resources = relativize(evaluate.item(i).getAttributes().getNamedItem("name").getTextContent()); String moduleName = getModuleName(resources); diff --git a/nbbuild/build.xml b/nbbuild/build.xml index eaa8fc14d585..c3b347bdbc20 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2181,7 +2181,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d - + @@ -2192,22 +2192,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d - - - Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements; and to You under the Apache License, Version 2.0. - - - + - - - Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements; and to You under the Apache License, Version 2.0. - - - + diff --git a/nbbuild/external/apache-rat-0.15-license.txt b/nbbuild/external/apache-rat-0.18-license.txt similarity index 99% rename from nbbuild/external/apache-rat-0.15-license.txt rename to nbbuild/external/apache-rat-0.18-license.txt index 3f0bcfb9aae6..c30480ff833e 100644 --- a/nbbuild/external/apache-rat-0.15-license.txt +++ b/nbbuild/external/apache-rat-0.18-license.txt @@ -1,6 +1,6 @@ Name: Apache Rat Origin: Apache Software Foundation -Version: 0.15 +Version: 0.18 License: Apache-2.0 Description: Apache Rat is a release audit tool, focused on licenses. URL: https://creadur.apache.org/rat/ diff --git a/nbbuild/external/binaries-list b/nbbuild/external/binaries-list index 1af63288950c..481ab38af4ba 100644 --- a/nbbuild/external/binaries-list +++ b/nbbuild/external/binaries-list @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -8D4F73654DAAE212850ADC3B0C02E5E056974B48 org.apache.rat:apache-rat:0.15 +DDAE691CC8E4A1C60B00A172AD4FF42ACB144C58 org.apache.rat:apache-rat:0.18 7EEF727AF7FCDAB0C7E8253456A9749646309360 jakarta.tck:sigtest-maven-plugin:2.7 C9AD4A0850AB676C5C64461A05CA524CDFFF59F1 com.googlecode.json-simple:json-simple:1.1.1 3A4E4ECCF553036BB0DDBA675486D574B62A01D8 org.apache.netbeans.modules.jackpot30:tool:12.3 diff --git a/nbbuild/rat-exclusions.txt b/nbbuild/rat-exclusions.txt index 113d0a947505..34b8e86d4473 100644 --- a/nbbuild/rat-exclusions.txt +++ b/nbbuild/rat-exclusions.txt @@ -65,6 +65,7 @@ enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/model_6_1_frag/* extide/gradle/netbeans-gradle-tooling/.gradle/** profiler/lib.profiler/release/BUILDINFO.txt webcommon/javascript2.jquery/external/jquery-api.xml +.ant-targets-build.xml ###### user-specific files **/nbproject/private/** @@ -252,6 +253,10 @@ ide/xml.text/src/org/netbeans/modules/xml/text/resources/XMLExample ide/xml.text/src/org/netbeans/modules/xml/text/resources/XMLExampleIndent ide/properties.syntax/src/org/netbeans/modules/properties/syntax/PropertiesExample +###### installer workaround 0.18 +nbbuild/installer/engine/src/org/netbeans/installer/product/components/netbeans-license-javafx.txt +nbbuild/installer/engine/src/org/netbeans/installer/product/components/netbeans-license-jtb.txt +nbbuild/installer/engine/src/org/netbeans/installer/product/components/netbeans-license-mysql.txt ###### GitHub Issue tooling .github/**