Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ private static String writeFiles(Set<String> listFile, String repo) {
}

private void doPopulateUnapproved(Map<String, ModuleInfo> 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);
Expand All @@ -246,7 +246,7 @@ private void doPopulateUnapproved(Map<String, ModuleInfo> moduleRATInfo, Element
}

private void doPopulateApproved(Map<String, ModuleInfo> 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);
Expand Down
18 changes: 3 additions & 15 deletions nbbuild/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2181,7 +2181,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d

<taskdef uri="antlib:org.apache.rat.anttasks" resource="org/apache/rat/anttasks/antlib.xml">
<classpath>
<pathelement location="external/apache-rat-0.15.jar"/>
<pathelement location="external/apache-rat-0.18.jar"/>
</classpath>
</taskdef>

Expand All @@ -2192,22 +2192,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<excludesfile name="build/rat-exclusions-licenseinfo.txt" />
</fileset>

<rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportfile="build/rat-report.txt">
<rat:fullTextMatcher licenseFamilyCategory="AL" licenseFamilyName="Apache License 2.0 Short header">
Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements; and to You under the Apache License, Version 2.0.
</rat:fullTextMatcher>
<rat:approvedLicense familyName="Apache License 2.0 Short header"/>

<rat:report xmlns:rat="antlib:org.apache.rat.anttasks" outputStyle="plain-rat" outputfile="nbbuild/build/rat-report.txt">
<resources refid="rat.files" />
</rat:report>
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks" format="xml" reportfile="build/rat-report.xml">
<rat:fullTextMatcher licenseFamilyCategory="AL" licenseFamilyName="Apache License 2.0 Short header">
Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements; and to You under the Apache License, Version 2.0.
</rat:fullTextMatcher>
<rat:approvedLicense familyName="Apache License 2.0 Short header"/>

<rat:report xmlns:rat="antlib:org.apache.rat.anttasks" outputStyle="xml" outputfile="nbbuild/build/rat-report.xml">
<resources refid="rat.files" />
</rat:report>
<taskdef name="rattotest" classname="org.netbeans.nbbuild.RatReportTask" classpath="${build.ant.classes.dir}"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion nbbuild/external/binaries-list
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions nbbuild/rat-exclusions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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/**
Expand Down Expand Up @@ -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
Comment thread
ebarboni marked this conversation as resolved.
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/**
Loading