This is an automated email from the ASF dual-hosted git repository.
claude pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/creadur-rat.git
commit 66e134635aa893c291df0b2b4c6e134d37b930c4
Merge: 658f61c6 056e53be
Author: Claude Warren <cla...@apache.org>
AuthorDate: Tue Apr 23 10:17:17 2024 +0100
Merge pull request #233 from Claudenw/RAT-355_RAT-366_merge
RAT-355 and RAT-366 fixes in one package
apache-rat-core/pom.xml | 3 +-
.../main/java/org/apache/rat/BuilderParams.java | 64 ++
.../src/main/java/org/apache/rat/Defaults.java | 13 +-
...Exception.java => ImplementationException.java} | 27 +-
.../src/main/java/org/apache/rat/Report.java | 86 ++-
.../java/org/apache/rat/ReportConfiguration.java | 61 +-
.../java/org/apache/rat/ReportTransformer.java | 1 +
.../src/main/java/org/apache/rat/Reporter.java | 158 +++--
.../rat/analysis/DefaultAnalyserFactory.java | 32 +-
.../rat/analysis/DocumentHeaderAnalyser.java | 28 +-
.../org/apache/rat/analysis/HeaderCheckWorker.java | 139 +++--
.../org/apache/rat/analysis/IHeaderMatcher.java | 111 ++--
.../CharFilter.java => analysis/IHeaders.java} | 24 +-
.../org/apache/rat/analysis/LicenseCollection.java | 134 -----
.../rat/analysis/RatHeaderAnalysisException.java | 2 +-
.../analysis/RatReportAnalysisResultException.java | 6 +-
.../org/apache/rat/analysis/UnknownLicense.java | 37 +-
.../analysis/license/FullTextMatchingLicense.java | 11 +-
.../license/SimplePatternBasedLicense.java | 8 +-
.../analysis/matchers/AbstractHeaderMatcher.java | 12 +-
.../matchers/AbstractMatcherContainer.java | 63 +-
.../analysis/matchers/AbstractSimpleMatcher.java | 74 ---
.../apache/rat/analysis/matchers/AndMatcher.java | 55 +-
.../rat/analysis/matchers/CopyrightMatcher.java | 108 +++-
.../rat/analysis/matchers/FullTextMatcher.java | 83 +--
.../apache/rat/analysis/matchers/NotMatcher.java | 49 +-
.../apache/rat/analysis/matchers/OrMatcher.java | 62 +-
.../rat/analysis/matchers/SPDXMatcherFactory.java | 52 +-
.../rat/analysis/matchers/SimpleRegexMatcher.java | 34 +-
.../rat/analysis/matchers/SimpleTextMatcher.java | 38 +-
.../rat/annotation/ApacheV2LicenseAppender.java | 4 +-
.../src/main/java/org/apache/rat/api/Document.java | 25 +-
.../src/main/java/org/apache/rat/api/MetaData.java | 372 +++---------
.../main/java/org/apache/rat/api/RatException.java | 11 +
.../org/apache/rat/config/AddLicenseHeaders.java | 7 +-
.../parameters/ComponentType.java} | 19 +-
.../rat/config/parameters/ConfigComponent.java | 61 ++
.../apache/rat/config/parameters/Description.java | 363 ++++++++++++
.../rat/config/parameters/DescriptionBuilder.java | 140 +++++
.../apache/rat/configuration/LicenseReader.java | 9 +-
.../rat/configuration/MatcherBuilderTracker.java | 21 +-
.../apache/rat/configuration/MatcherReader.java | 1 +
.../org/apache/rat/configuration/XMLConfig.java | 109 ++++
.../rat/configuration/XMLConfigurationReader.java | 483 ++++++++++-----
.../rat/configuration/XMLConfigurationWriter.java | 296 ++++++++++
.../configuration/builders/AbstractBuilder.java | 13 +-
.../rat/configuration/builders/AllBuilder.java | 5 +-
.../rat/configuration/builders/AnyBuilder.java | 5 +-
.../builders/ChildContainerBuilder.java | 57 +-
.../configuration/builders/CopyrightBuilder.java | 5 +-
.../configuration/builders/MatcherRefBuilder.java | 83 ++-
.../rat/configuration/builders/NotBuilder.java | 24 +-
.../rat/configuration/builders/RegexBuilder.java | 14 +-
.../rat/configuration/builders/SpdxBuilder.java | 35 +-
.../rat/configuration/builders/TextBuilder.java | 24 +-
.../org/apache/rat/document/ToNameTransformer.java | 2 +-
.../org/apache/rat/header/ArrayCharFilter.java | 2 +-
.../java/org/apache/rat/header/CharFilter.java | 2 +-
.../rat/header/FilteringSequenceFactory.java | 2 +-
.../java/org/apache/rat/header/HeaderBean.java | 1 +
.../java/org/apache/rat/header/HeaderMatcher.java | 1 +
.../org/apache/rat/header/LineNumberReader.java | 1 +
.../main/java/org/apache/rat/license/ILicense.java | 140 +++--
.../org/apache/rat/license/ILicenseFamily.java | 27 +-
.../rat/license/LicenseFamilySetFactory.java | 12 +-
.../org/apache/rat/license/LicenseSetFactory.java | 120 ++--
.../java/org/apache/rat/license/SimpleLicense.java | 194 +++++--
.../java/org/apache/rat/policy/DefaultPolicy.java | 35 +-
.../apache/rat/report/ConfigurationReport.java} | 57 +-
.../apache/rat/report/claim/ClaimStatistic.java | 121 +---
.../report/claim/impl/AbstractClaimReporter.java | 81 +--
.../rat/report/claim/impl/ClaimAggregator.java | 88 ++-
.../claim/impl/xml/SimpleXmlClaimReporter.java | 118 ++--
.../claim/util/ClaimReporterMultiplexer.java | 49 +-
.../rat/report/claim/util/LicenseAddingReport.java | 13 +-
.../apache/rat/report/xml/XmlReportFactory.java | 15 +-
.../apache/rat/report/xml/writer/IXmlWriter.java | 27 +-
.../rat/report/xml/writer/impl/base/XmlWriter.java | 45 +-
.../src/main/java/org/apache/rat/utils/Log.java | 78 ++-
.../src/main/resources/org/apache/rat/default.xml | 20 +-
.../resources/org/apache/rat/missing-headers.xsl | 2 +-
.../main/resources/org/apache/rat/plain-rat.xsl | 78 ++-
.../main/resources/org/apache/rat/rat-config.xsd | 181 ++++++
.../main/resources/org/apache/rat/rat-report.xsd | 47 ++
.../org/apache/rat/unapproved-licenses.xsl | 5 +-
.../src/test/java/org/apache/rat/DefaultsTest.java | 5 +-
.../org/apache/rat/ReportConfigurationTest.java | 123 ++--
.../src/test/java/org/apache/rat/ReportTest.java | 128 +++-
.../java/org/apache/rat/ReportTransformerTest.java | 2 +-
.../src/test/java/org/apache/rat/ReporterTest.java | 210 +++++--
.../apache/rat/analysis/AnalyserFactoryTest.java | 81 ++-
.../apache/rat/analysis/HeaderCheckWorkerTest.java | 8 +-
.../rat/analysis/license/AbstractLicenseTest.java | 93 ++-
.../license/ApacheSoftwareLicenseTest.java | 14 -
.../license/AppliedApacheSoftwareLicenseTest.java | 16 -
.../rat/analysis/license/CDDL1LicenseTest.java | 2 +-
.../rat/analysis/license/DirectoryScanner.java | 17 +-
.../rat/analysis/license/GPLLicenseTest.java | 23 +-
.../rat/analysis/license/GeneratedLicenseTest.java | 2 +-
.../rat/analysis/license/W3CLicenseTest.java | 11 +-
.../rat/analysis/matchers/AbstractMatcherTest.java | 65 +++
.../rat/analysis/matchers/AndMatcherTest.java | 51 +-
.../analysis/matchers/CopyrightMatcherTest.java | 52 +-
.../rat/analysis/matchers/FullTextMatcherTest.java | 48 +-
.../rat/analysis/matchers/NotMatcherTest.java | 37 +-
.../rat/analysis/matchers/OrMatcherTest.java | 50 +-
.../rat/analysis/matchers/SPDXMatcherTest.java | 51 +-
.../analysis/matchers/SimpleCopyrightTests.java | 19 +-
.../analysis/matchers/SimpleRegexMatcherTest.java | 48 +-
.../analysis/matchers/SimpleTextMatcherTest.java | 53 +-
.../apache/rat/annotation/TestLicenseAppender.java | 646 ++++++++++-----------
.../config/parameters/DescriptionBuilderTest.java | 56 ++
...erTest.java => XMLConfigurationReaderTest.java} | 42 +-
.../configuration/XMLConfigurationWriterTest.java | 89 +++
.../rat/configuration/builders/AllBuilderTest.java | 118 ++++
.../rat/configuration/builders/AnyBuilderTest.java | 118 ++++
.../builders/CopyrightBuilderTest.java | 267 +++++++++
.../rat/configuration/builders/NotBuilderTest.java | 88 +++
.../configuration/builders/RegexBuilderTest.java | 80 +++
.../configuration/builders/SpdxBuilderTest.java | 76 +++
.../configuration/builders/TextBuilderTest.java | 167 ++++++
.../java/org/apache/rat/document/MockDocument.java | 18 +-
.../apache/rat/document/MockDocumentAnalyser.java | 9 +-
.../org/apache/rat/header/SimpleCharFilter.java | 2 +-
.../org/apache/rat/license/SimpleLicenseTest.java | 65 +++
.../org/apache/rat/policy/DefaultPolicyTest.java | 95 ++-
.../apache/rat/report/ConfigurationReportTest.java | 104 ++++
.../rat/report/xml/XmlReportFactoryTest.java | 27 +-
.../org/apache/rat/report/xml/XmlReportTest.java | 119 ----
.../java/org/apache/rat/test/utils/Resources.java | 23 +-
.../org/apache/rat/testhelpers/TestingLicense.java | 56 +-
.../org/apache/rat/testhelpers/TestingMatcher.java | 30 +-
.../java/org/apache/rat/testhelpers/TextUtils.java | 17 +-
.../java/org/apache/rat/testhelpers/XmlUtils.java | 74 +--
.../test/resources/XmlOutputExamples/elements.xml | 45 +-
.../src/test/resources/elements/generated.txt | 3 +
.../src/test/resources/elements/tri.txt | 6 +
.../org/apache/rat/MatcherContainerResource.txt | 2 +
apache-rat-plugin/pom.xml | 7 +-
apache-rat-plugin/src/it/it1/verify.groovy | 4 +-
apache-rat-plugin/src/it/it4_RAT-168/verify.groovy | 4 +-
.../java/org/apache/rat/mp/AbstractRatMojo.java | 8 +-
.../src/main/java/org/apache/rat/mp/All.java | 2 +-
.../src/main/java/org/apache/rat/mp/Any.java | 2 +-
.../src/main/java/org/apache/rat/mp/Copyright.java | 8 +-
.../java/org/apache/rat/mp/FilesReportable.java | 62 +-
.../src/main/java/org/apache/rat/mp/License.java | 9 +-
.../src/main/java/org/apache/rat/mp/Not.java | 2 +-
.../main/java/org/apache/rat/mp/RatCheckMojo.java | 41 +-
.../main/java/org/apache/rat/mp/RatReportMojo.java | 12 +-
.../src/main/java/org/apache/rat/mp/Text.java | 2 +-
.../apache/rat/mp/BetterAbstractMojoTestCase.java | 86 +--
.../java/org/apache/rat/mp/RatCheckMojoTest.java | 72 ++-
.../java/org/apache/rat/mp/RatTestHelpers.java | 38 ++
.../src/test/resources/unit/RAT-343/pom.xml | 1 +
apache-rat-tasks/run-antunit.xml | 11 +-
.../src/main/java/org/apache/rat/anttasks/All.java | 2 +-
.../src/main/java/org/apache/rat/anttasks/Any.java | 2 +-
.../main/java/org/apache/rat/anttasks/License.java | 12 +-
.../src/main/java/org/apache/rat/anttasks/Not.java | 2 +-
.../main/java/org/apache/rat/anttasks/Regex.java | 7 +-
.../main/java/org/apache/rat/anttasks/Report.java | 6 +-
.../rat/anttasks/ResourceCollectionContainer.java | 12 +-
.../main/java/org/apache/rat/anttasks/Text.java | 4 +-
.../java/org/apache/rat/anttasks/ReportTest.java | 40 +-
.../src/test/java/org/example/Matcher.java | 11 +-
.../antunit/report-bad-configurations.xml | 7 +-
.../src/test/resources/antunit/report-junit.xml | 7 +-
.../resources/antunit/report-normal-operation.xml | 172 +++---
{apache-rat-core => apache-rat-tools}/pom.xml | 61 +-
apache-rat-tools/pom.xml.new | 104 ----
.../main/java/org/apache/rat/Documentation.java | 148 +++++
apache-rat/pom.xml | 2 +
apache-rat/src/site/examples/default_output.txt | 81 +++
apache-rat/src/site/examples/rat-report.txt | 49 ++
.../src/site/examples/unapproved-licenses.txt | 0
pom.xml | 1 +
src/site/apt/index.apt.vm | 10 +
src/site/apt/license_def.apt.vm | 143 +++++
src/site/apt/matcher_def.apt.vm | 323 +++++++++++
180 files changed, 6837 insertions(+), 3716 deletions(-)
