You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by po...@apache.org on 2023/11/01 21:29:01 UTC
(creadur-rat) 01/01: RAT-321: Merge pull request #159 from Claudenw/RAT-321-fix
This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/creadur-rat.git
commit 3b06360b768f11d06803cf6e26196da8e0145927
Merge: 40ad2467 1b0a188e
Author: P. Ottlinger <ot...@users.noreply.github.com>
AuthorDate: Wed Nov 1 22:28:55 2023 +0100
RAT-321: Merge pull request #159 from Claudenw/RAT-321-fix
RAT-321 cleanup of testing issues
.buildtools/formatPom | 20 ++
.github/workflows/maven.yml | 5 +-
apache-rat-api/pom.xml | 3 -
apache-rat-core/pom.xml | 33 +--
.../src/main/java/org/apache/rat/Report.java | 123 ++++++-----
.../java/org/apache/rat/ReportConfiguration.java | 63 +++++-
.../org/apache/rat/analysis/LicenseCollection.java | 5 +
.../org/apache/rat/analysis/UnknownLicense.java | 7 +-
.../apache/rat/configuration/LicenseReader.java | 10 +-
.../rat/configuration/XMLConfigurationReader.java | 92 +++++++--
.../main/java/org/apache/rat/license/ILicense.java | 95 +++++++--
.../org/apache/rat/license/ILicenseBuilder.java | 77 -------
.../org/apache/rat/license/ILicenseFamily.java | 6 +
.../apache/rat/license/ILicenseFamilyBuilder.java | 6 +
.../rat/license/LicenseFamilySetFactory.java | 121 +++++++++++
.../org/apache/rat/license/LicenseSetFactory.java | 29 +--
.../java/org/apache/rat/license/SimpleLicense.java | 20 +-
.../java/org/apache/rat/policy/DefaultPolicy.java | 4 +-
.../src/main/resources/org/apache/rat/default.xml | 49 +++--
.../src/test/java/org/apache/rat/DefaultsTest.java | 4 +-
.../org/apache/rat/ReportConfigurationTest.java | 87 +++++++-
.../src/test/java/org/apache/rat/ReportTest.java | 12 ++
.../apache/rat/analysis/AnalyserFactoryTest.java | 2 +-
.../rat/analysis/license/AbstractLicenseTest.java | 105 +++++-----
.../license/ApacheSoftwareLicenseTest.java | 6 +-
.../license/AppliedApacheSoftwareLicenseTest.java | 4 +-
.../rat/analysis/license/CDDL1LicenseTest.java | 6 +-
.../rat/analysis/license/GPLLicenseTest.java | 4 +-
.../rat/analysis/license/GeneratedLicenseTest.java | 4 +-
.../rat/analysis/license/IllumosLicenseTest.java | 5 +-
.../rat/analysis/license/MITLicenseTest.java | 4 +-
.../rat/analysis/license/OASISLicenseTest.java | 4 +-
.../rat/analysis/license/W3CLicenseTest.java | 4 +-
.../rat/configuration/ConfigurationReaderTest.java | 54 +++--
.../org/apache/rat/policy/DefaultPolicyTest.java | 12 +-
.../rat/report/xml/XmlReportFactoryTest.java | 9 +-
.../org/apache/rat/testhelpers/TestingLicense.java | 21 +-
.../org/apache/rat/testhelpers/TestingMatcher.java | 8 +
.../TextUtils.java} | 29 +--
apache-rat-plugin/pom.xml | 68 +++---
apache-rat-plugin/src/it/RAT-268/module1/pom.xml | 5 +-
apache-rat-plugin/src/it/RAT-268/module3/pom.xml | 5 +-
apache-rat-plugin/src/it/RAT-268/pom.xml | 7 +-
apache-rat-plugin/src/it/it1/pom.xml | 198 +++++++++---------
apache-rat-plugin/src/it/it1/verify.groovy | 2 +-
apache-rat-plugin/src/it/it4_RAT-168/pom.xml | 5 +-
.../java/org/apache/rat/mp/AbstractRatMojo.java | 48 +++--
...LicenseFamilySpecification.java => Family.java} | 48 ++---
.../java/org/apache/rat/mp/FilesReportable.java | 64 +++---
.../src/main/java/org/apache/rat/mp/License.java | 12 +-
.../main/java/org/apache/rat/mp/RatCheckMojo.java | 1 -
.../src/main/java/org/apache/rat/mp/Regex.java | 1 -
.../src/main/java/org/apache/rat/mp/Text.java | 1 -
.../apache/rat/mp/BetterAbstractMojoTestCase.java | 118 +++++++++++
.../java/org/apache/rat/mp/RatCheckMojoTest.java | 228 ++++++++-------------
.../java/org/apache/rat/mp/RatTestHelpers.java | 50 ++---
.../src/test/resources/unit/it1/pom.xml | 5 +-
.../src/test/resources/unit/it2/pom.xml | 5 +-
.../src/test/resources/unit/it3/pom.xml | 7 +-
.../src/test/resources/unit/it4/pom.xml | 5 +-
.../src/test/resources/unit/it5/.bzrignore | 5 +
.../src/test/resources/unit/it5/pom.xml | 114 +++++++++++
apache-rat-tasks/pom.xml | 36 ++--
.../main/java/org/apache/rat/anttasks/Family.java | 22 +-
.../main/java/org/apache/rat/anttasks/License.java | 22 +-
.../main/java/org/apache/rat/anttasks/Report.java | 51 +++--
.../rat/anttasks/ResourceCollectionContainer.java | 19 +-
.../rat/anttasks/AbstractRatAntTaskTest.java | 1 -
.../java/org/apache/rat/anttasks/ReportTest.java | 35 +++-
.../src/test/resources/antunit/customLicense.xml | 5 +-
.../antunit/report-bad-configurations.xml | 13 +-
.../src/test/resources/antunit/report-junit.xml | 26 ++-
.../resources/antunit/report-normal-operation.xml | 76 +++----
apache-rat/pom.xml | 17 +-
pom.xml | 3 +-
75 files changed, 1535 insertions(+), 945 deletions(-)