This is an automated email from the ASF dual-hosted git repository. pottlinger pushed a commit to branch feature/RAT-397 in repository https://gitbox.apache.org/repos/asf/creadur-rat.git
commit 815a9cab70b62b180a0e8b7b4983988d8b32ecfc Merge: 4fc02923 fd1202b1 Author: P. Ottlinger <[email protected]> AuthorDate: Thu Feb 13 22:32:40 2025 +0100 RAT-397: Merges from master .asf.yaml | 3 +- .github/workflows/maven.yml | 2 +- .mvn/develocity.xml | 3 +- .mvn/extensions.xml | 2 +- README.md | 2 +- apache-rat-core/pom.xml | 5 + .../src/it/java/org/apache/rat/ReportTest.java | 2 +- .../it/resources/ReportTest/RAT_14/verify.groovy | 2 +- .../RAT_335/{ignore.txt => commandLine.txt} | 2 - .../resources/ReportTest/RAT_335/src}/.gitignore | 0 .../ReportTest/RAT_335/src}/dir1/.gitignore | 0 .../ReportTest/RAT_335/src}/dir1/dir1.txt | 0 .../ReportTest/RAT_335/src}/dir1/file1.log | 0 .../resources/ReportTest/RAT_335/src}/dir2/dir2.md | 0 .../ReportTest/RAT_335/src}/dir3/dir3.log | 0 .../it/resources/ReportTest/RAT_335/src}/root.md | 0 .../it/resources/ReportTest/RAT_335/verify.groovy | 59 +-- .../copyResourcesFromParentProject.groovy | 69 +-- .../src/main/java/org/apache/rat/Defaults.java | 2 +- .../main/java/org/apache/rat/OptionCollection.java | 40 +- .../src/main/java/org/apache/rat/Report.java | 4 +- .../java/org/apache/rat/ReportConfiguration.java | 17 +- ...ltAnalyserFactory.java => AnalyserFactory.java} | 52 +- .../rat/analysis/DocumentHeaderAnalyser.java | 4 +- .../org/apache/rat/analysis/TikaProcessor.java | 9 +- .../src/main/java/org/apache/rat/api/MetaData.java | 23 +- .../main/java/org/apache/rat/commandline/Arg.java | 38 +- .../apache/rat/commandline/ArgumentContext.java | 28 +- .../org/apache/rat/commandline/Converters.java | 57 +- .../rat/config/exclusion/ExclusionProcessor.java | 214 ++++---- .../rat/config/exclusion/ExclusionUtils.java | 86 ++- .../apache/rat/config/exclusion/FileProcessor.java | 115 ---- .../apache/rat/config/exclusion/MatcherSet.java | 178 +++++++ .../rat/config/exclusion/StandardCollection.java | 71 ++- .../AbstractFileProcessorBuilder.java | 232 ++++++++ ...noreProcessor.java => BazaarIgnoreBuilder.java} | 16 +- ...CVSFileProcessor.java => CVSIgnoreBuilder.java} | 24 +- .../fileProcessors/DescendingFileProcessor.java | 121 ----- .../exclusion/fileProcessors/GitFileProcessor.java | 70 --- .../exclusion/fileProcessors/GitIgnoreBuilder.java | 105 ++++ ...HgIgnoreProcessor.java => HgIgnoreBuilder.java} | 34 +- .../rat/config/exclusion/plexus/MatchPattern.java | 13 +- .../rat/config/exclusion/plexus/MatchPatterns.java | 42 +- .../rat/config/exclusion/plexus/SelectorUtils.java | 1 - .../rat/configuration/XMLConfigurationReader.java | 161 +++--- .../apache/rat/document/ArchiveEntryDocument.java | 6 +- .../org/apache/rat/document/ArchiveEntryName.java | 74 +++ ...DocumentAnalyser.java => DocumentAnalyser.java} | 3 +- .../rat/document/DocumentAnalyserMultiplexer.java | 50 -- .../java/org/apache/rat/document/DocumentName.java | 585 ++++++++++++++------- .../apache/rat/document/DocumentNameMatcher.java | 375 +++++++++++-- .../src/main/java/org/apache/rat/help/Help.java | 2 +- .../org/apache/rat/license/ILicenseFamily.java | 16 + .../org/apache/rat/license/LicenseSetFactory.java | 27 +- .../java/org/apache/rat/policy/DefaultPolicy.java | 70 --- .../java/org/apache/rat/policy/package-info.java | 23 - .../main/java/org/apache/rat/report/RatReport.java | 2 +- .../rat/report/claim/ClaimReporterMultiplexer.java | 6 +- .../apache/rat/report/xml/XmlReportFactory.java | 12 +- .../apache/rat/report/xml/writer/XmlWriter.java | 4 +- .../src/main/java/org/apache/rat/utils/Log.java | 17 +- .../java/org/apache/rat/walker/ArchiveWalker.java | 18 +- .../java/org/apache/rat/walker/FileListWalker.java | 26 +- .../markdown/development/write_file_processor.md | 2 +- .../src/test/java/org/apache/rat/DefaultsTest.java | 2 +- .../java/org/apache/rat/OptionCollectionTest.java | 74 ++- .../org/apache/rat/ReportConfigurationTest.java | 112 ++-- .../src/test/java/org/apache/rat/ReporterTest.java | 21 +- ...erFactoryTest.java => AnalyserFactoryTest.java} | 108 ++-- .../apache/rat/analysis/DocumentAnalyserTest.java | 333 ++++++++++++ .../apache/rat/analysis/HeaderCheckWorkerTest.java | 2 + .../java/org/apache/rat/commandline/ArgTests.java | 19 +- .../config/exclusion/ExclusionProcessorTest.java | 161 ++++-- .../rat/config/exclusion/FileProcessorTest.java | 62 --- .../config/exclusion/StandardCollectionTest.java | 2 +- .../fileProcessors/AbstractIgnoreBuilderTest.java | 115 ++++ .../AbstractIgnoreProcessorTest.java | 62 --- ...essorTest.java => BazaarIgnoreBuilderTest.java} | 22 +- ...rocessorTest.java => CVSIgnoreBuilderTest.java} | 21 +- .../DescendingFileProcessorTest.java | 70 --- .../fileProcessors/GitFileProcessorTest.java | 118 ----- .../fileProcessors/GitIgnoreBuilderTest.java | 138 +++++ ...ProcessorTest.java => HgIgnoreBuilderTest.java} | 33 +- .../config/parameters/DescriptionBuilderTest.java | 2 +- .../rat/config/results/ClaimValidatorTest.java | 2 - .../document/DocumentAnalyserMultiplexerTest.java | 60 --- .../rat/document/DocumentNameBuilderTest.java | 167 ++++++ .../rat/document/DocumentNameMatcherTest.java | 93 ++++ .../org/apache/rat/document/DocumentNameTest.java | 315 +++++++---- .../java/org/apache/rat/document/FSInfoTest.java | 58 ++ .../org/apache/rat/document/FileDocumentTest.java | 33 +- .../rat/document/guesser/NoteGuesserTest.java | 26 +- .../apache/rat/license/LicenseSetFactoryTest.java | 168 ++++++ .../org/apache/rat/policy/DefaultPolicyTest.java | 169 ------ .../rat/report/xml/XmlReportFactoryTest.java | 2 +- .../apache/rat/test/AbstractOptionsProvider.java | 377 +++++++------ .../java/org/apache/rat/test/utils/Resources.java | 29 +- .../apache/rat/testhelpers/TestingDocument.java | 31 +- .../rat/testhelpers/TestingDocumentAnalyser.java | 4 +- .../org/apache/rat/testhelpers/TestingLicense.java | 6 + .../java/org/apache/rat/testhelpers/XmlUtils.java | 26 +- .../org/apache/rat/walker/DirectoryWalkerTest.java | 2 +- .../org/apache/rat/walker/FileListWalkerTest.java | 12 +- .../commandLine.txt | 0 .../expected-message.txt | 0 .../{RAT_355 => GitIgnoreBuilderTest}/pom.xml | 0 .../resources/GitIgnoreBuilderTest/src}/.gitignore | 0 .../src/README.txt | 0 .../GitIgnoreBuilderTest/src}/dir1/.gitignore | 0 .../src/dir1/dir1.md | 0 .../src/dir1/dir1.txt} | 0 .../src/dir1/file1.log} | 0 .../GitIgnoreBuilderTest/src/dir2/dir2.md | 0 .../GitIgnoreBuilderTest/src}/dir2/dir2.txt | 0 .../GitIgnoreBuilderTest/src}/dir3/dir3.log | 0 .../GitIgnoreBuilderTest/src}/dir3/file3.log | 0 .../GitIgnoreBuilderTest}/src/invoker.properties | 0 .../resources/GitIgnoreBuilderTest/src}/root.md | 0 .../verify.groovy | 0 apache-rat-plugin/.gitignore | 2 + apache-rat-plugin/pom.xml | 14 +- .../src/it/CustomLicense/.rat/customConfig.xml | 17 + apache-rat-plugin/src/it/CustomLicense/pom.xml | 28 +- apache-rat-plugin/src/it/RAT-268/pom.xml | 10 +- .../src/it/RAT-469}/invoker.properties | 2 +- apache-rat-plugin/src/it/RAT-469/pom.xml | 49 ++ apache-rat-plugin/src/it/RAT-469/verify.groovy | 44 ++ .../java/org/apache/rat/mp/AbstractRatMojo.java | 39 +- .../java/org/apache/rat/mp/OptionMojoTest.java | 109 ++-- .../java/org/apache/rat/mp/RatCheckMojoTest.java | 393 +++++++------- .../src/test/resources/unit/RAT-107/.classpath | 1 + .../src/test/resources/unit/RAT-107/.project | 1 + .../test/resources/unit/RAT-107/.settings/dummy | 0 .../src/test/resources/unit/RAT-107/dummy.ipr | 1 + .../resources/unit/RAT-107/submodule/.classpath | 1 + .../test/resources/unit/RAT-107/submodule/.project | 1 + .../unit/RAT-107/submodule/.settings/dummy | 0 .../resources/unit/RAT-107/submodule/dummy.iml | 1 + .../resources/unit/RAT-107/submodule/dummy.ipr | 1 + .../resources/unit/RAT-107/submodule/dummy.iws | 1 + .../unit/RAT-335-GitIgnore/invoker.properties | 16 - .../unit/{RAT-335-GitIgnore => RAT-335}/.gitignore | 0 .../unit/{RAT-335-GitIgnore => RAT-335}/README.txt | 0 .../{RAT-335-GitIgnore => RAT-335}/dir1/.gitignore | 0 .../src/test/resources/unit/RAT-335}/dir1/dir1.md | 0 .../{RAT-335-GitIgnore => RAT-335}/dir1/dir1.txt | 0 .../{RAT-335-GitIgnore => RAT-335}/dir1/file1.log | 0 .../{RAT-335-GitIgnore => RAT-335}/dir2/dir2.md | 0 .../src/test/resources/unit/RAT-335}/dir2/dir2.txt | 0 .../{RAT-335-GitIgnore => RAT-335}/dir3/dir3.log | 0 .../test/resources/unit/RAT-335}/dir3/file3.log | 0 .../unit/{RAT-335-GitIgnore => RAT-335}/pom.xml | 0 .../unit/{RAT-335-GitIgnore => RAT-335}/root.md | 0 .../unit/RAT-362-GitIgnore/invoker.properties | 16 - .../unit/{RAT-362-GitIgnore => RAT-362}/.gitignore | 0 .../unit/{RAT-362-GitIgnore => RAT-362}/bar.md | 0 .../unit/{RAT-362-GitIgnore => RAT-362}/foo.md | 0 .../unit/{RAT-362-GitIgnore => RAT-362}/pom.xml | 1 + .../src/test/resources/unit/it3/pom.xml | 1 + .../src/test/resources/unit/it5/.bzrignore | 5 - .../test/resources/unit/it5/.rat/customConfig.xml | 23 + .../src/test/resources/unit/it5/pom.xml | 104 +--- .../main/java/nl/basjes/something/Something.java | 26 + .../main/java/org/apache/rat/anttasks/Report.java | 2 +- .../rat/anttasks/ResourceCollectionContainer.java | 2 +- .../org/apache/rat/anttasks/ReportOptionTest.java | 35 +- apache-rat-tools/pom.xml | 8 +- .../java/org/apache/rat/tools/Documentation.java | 3 +- .../src/main/java/org/apache/rat/tools/Naming.java | 3 +- pom.xml | 20 +- src/changes/changes.xml | 12 + src/site/site.xml | 2 +- 172 files changed, 4543 insertions(+), 2734 deletions(-) diff --cc src/site/site.xml index 0b65335d,a64c7355..2c196a41 --- a/src/site/site.xml +++ b/src/site/site.xml @@@ -81,39 -84,51 +81,39 @@@ <item name="UI Development" href="development/ui_implementation.html"/> <item name="Writing a File Processor" href="apache-rat-core/development/write_file_processor.html"/> </menu> - - <menu name="Apache Creadur™" inherit="bottom"> - <item name='Creadur Project Home' href="https://creadur.apache.org"/> - <item name='Apache Tentacles' href="https://creadur.apache.org/tentacles"/> - <item name='Apache Whisker' href="https://creadur.apache.org/whisker"/> - <item name='Security' href='https://www.apache.org/security/'/> - <item name='License' href='https://www.apache.org/licenses/'/> - <item name='Privacy' href='https://privacy.apache.org/policies/privacy-policy-public.html'/> - <item name='Sponsorship' href='https://www.apache.org/foundation/sponsorship.html'/> - <item name='Thanks' href='https://www.apache.org/foundation/thanks.html'/> + <menu name="Apache Creadur™" inherit="bottom"> + <item name="Creadur Project Home" href="https://creadur.apache.org"/> + <item name="Apache Tentacles" href="https://creadur.apache.org/tentacles"/> + <item name="Apache Whisker" href="https://creadur.apache.org/whisker"/> + <item name="Security" href="https://www.apache.org/security/"/> + <item name="License" href="https://www.apache.org/licenses/"/> + <item name="Privacy" href="https://privacy.apache.org/policies/privacy-policy-public.html"/> + <item name="Sponsorship" href="https://www.apache.org/foundation/sponsorship.html"/> + <item name="Thanks" href="https://www.apache.org/foundation/thanks.html"/> </menu> - <menu name="The Apache Software Foundation" inherit="bottom"> - <item name='About the Foundation' - href="https://www.apache.org/foundation"/> - <item name='The projects' - href="https://projects.apache.org"/> - <item name='The people' - href="https://people.apache.org"/> - <item name='How we work' - href='https://www.apache.org/foundation/how-it-works.html'/> - <item name='Our history' - href='https://www.apache.org/foundation/how-it-works.html#history'/> - <item name='News' - href='https://blogs.apache.org/foundation/'/> + <item name="About the Foundation" href="https://www.apache.org/foundation"/> + <item name="The projects" href="https://projects.apache.org"/> + <item name="The people" href="https://people.apache.org"/> + <item name="How we work" href="https://www.apache.org/foundation/how-it-works.html"/> + <item name="Our history" href="https://www.apache.org/foundation/how-it-works.html#history"/> + <item name="News" href="https://blogs.apache.org/foundation/"/> </menu> - <menu name="Contribute" inherit="bottom"> - <item name="Get Involved" href='https://www.apache.org/foundation/getinvolved.html'/> + <item name="Get Involved" href="https://www.apache.org/foundation/getinvolved.html"/> </menu> - <menu name="Committer Info" inherit="bottom"> - <item name="ASF Committers' FAQ" href='https://www.apache.org/dev/committers.html'/> - <item name='New Committers Guide' href='https://www.apache.org/dev/new-committers-guide.html'/> + <item name="ASF Committers' FAQ" href="https://www.apache.org/dev/committers.html"/> + <item name="New Committers Guide" href="https://www.apache.org/dev/new-committers-guide.html"/> <item name="How to publish this site" href="https://gitbox.apache.org/repos/asf/creadur-site/blob/asf-site/README.md"/> - <item name='Community' href='https://community.apache.org/'/> - <item name='Legal' href='https://www.apache.org/legal/'/> - <item name='Branding' href='https://www.apache.org/foundation/marks/'/> - <item name='Media Relations' href='https://www.apache.org/press/'/> + <item name="Community" href="https://community.apache.org/"/> + <item name="Legal" href="https://www.apache.org/legal/"/> + <item name="Branding" href="https://www.apache.org/foundation/marks/"/> + <item name="Media Relations" href="https://www.apache.org/press/"/> </menu> - <menu ref="modules"/> <menu ref="reports"/> - <footer>Copyright &copy; 2016-2024 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. - + <footer>Copyright &copy; 2016-2025 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache Creadur, Creadur, Apache Rat, Apache Tentacles, Apache Whisker, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks of Oracle and/or its affiliates.
