Skip to content

Commit

Permalink
Merge pull request #5884 from ebarboni/ratbump
Browse files Browse the repository at this point in the history
Fix some of our exclusion for rat
  • Loading branch information
ebarboni authored Jun 27, 2023
2 parents 5d19e8a + 7203eed commit cfb7187
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 3 deletions.
19 changes: 19 additions & 0 deletions java/java.lsp.server/vscode/src/test/ws/empty.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,21 @@

/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
export function empty(): any {
}
2 changes: 1 addition & 1 deletion nbbuild/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2185,7 +2185,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.12.jar"/>
<pathelement location="external/apache-rat-0.15.jar"/>
</classpath>
</taskdef>

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.12
Version: 0.15
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.
16398550402B27F81CD0D508CEF54B3E47A4A6DA org.apache.rat:apache-rat:0.12
8D4F73654DAAE212850ADC3B0C02E5E056974B48 org.apache.rat:apache-rat:0.15
A8E7C929F046F3890F4A986F3D7EE8E4C4253C6B org.apidesign.javadoc:codesnippet-doclet:0.82
B8A142EBDE0CDC071A347B2E93C8548C2A5D09B0 org.netbeans.tools:sigtest-maven-plugin:1.4
C9AD4A0850AB676C5C64461A05CA524CDFFF59F1 com.googlecode.json-simple:json-simple:1.1.1
Expand Down
14 changes: 14 additions & 0 deletions nbbuild/rat-exclusions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1_frag/*
enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/model_4_0_frag/*
enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/model_5_0_frag/*
enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/model_6_0_frag/*
extide/gradle/netbeans-gradle-tooling/.gradle/**
profiler/lib.profiler/release/BUILDINFO.txt
webcommon/javascript2.jquery/external/jquery-api.xml

###### user-specific files
**/nbproject/private/**
Expand Down Expand Up @@ -201,6 +204,17 @@ websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth/*
websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/*
### generated ANTLR
java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLine.tokens
### generated by ANTLR at ide/languages.hcl/src/org/netbeans/modules/languages/hcl/grammar/g4/*
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/grammar/TerraformLexer.java
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/grammar/HCLExpressionParser.java
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/grammar/HCLExpressionParserBaseListener.java
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/grammar/HCLExpressionParserListener.java
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/grammar/HCLLexer.java
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/grammar/HCLParser.java
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/grammar/HCLParserBaseListener.java
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/grammar/HCLParserListener.java



###### license files
apisupport/apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/**
Expand Down

0 comments on commit cfb7187

Please sign in to comment.