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 1b7ab07ba3a9cb46ab40cdc64161fb00e4efdad1
Merge: dede91d0 9ac10a4c
Author: Claude Warren <[email protected]>
AuthorDate: Thu Jul 4 07:54:27 2024 +0100

    Merge pull request #257 from Claudenw/RAT-323_harmonize
    
    RAT-323: harmonize - Part 1.

 apache-rat-core/pom.xml                            |  19 +
 .../src/main/java/org/apache/rat/Defaults.java     | 153 ++++--
 .../rat/{Report.java => OptionCollection.java}     | 382 ++++++-------
 .../src/main/java/org/apache/rat/Report.java       | 589 +-------------------
 .../java/org/apache/rat/ReportConfiguration.java   | 268 ++++++----
 .../apache/rat/analysis/license/BaseLicense.java   |   5 +-
 .../rat/analysis/license/DeprecatedConfig.java     |   6 +-
 .../analysis/license/FullTextMatchingLicense.java  |   3 +
 .../license/SimplePatternBasedLicense.java         |   4 +-
 .../main/java/org/apache/rat/api/package-info.java |  21 +
 .../java/org/apache/rat/config/package-info.java   |  21 +
 .../java/org/apache/rat/configuration/Format.java  |  11 +-
 .../rat/configuration/MatcherBuilderTracker.java   |  20 +-
 .../rat/configuration/XMLConfigurationWriter.java  |   2 +-
 .../java/org/apache/rat/utils/CasedString.java     | 195 +++++++
 .../test/java/org/apache/rat/IOptionsProvider.java | 107 ++++
 .../java/org/apache/rat/OptionCollectionTest.java  | 595 +++++++++++++++++++++
 .../org/apache/rat/ReportConfigurationTest.java    |  33 +-
 .../src/test/java/org/apache/rat/ReportTest.java   | 381 +------------
 .../src/test/java/org/apache/rat/ReporterTest.java |  12 +-
 .../resources/OptionTools/One.xml}                 |  12 +-
 .../resources/OptionTools/Two.xml}                 |  12 +-
 apache-rat-plugin/pom.xml                          |  74 ++-
 .../java/org/apache/rat/mp/AbstractRatMojo.java    | 397 +++++++-------
 .../main/java/org/apache/rat/mp/RatCheckMojo.java  | 117 ++--
 .../main/java/org/apache/rat/mp/RatReportMojo.java |  55 +-
 .../resources/org/apache/rat/mp/package-info.java  |  21 +
 .../main/resources/org/apache/rat/mp/package.html  |  29 -
 .../src/test/filtered-resources/optionTest/pom.tpl |  24 +-
 .../apache/rat/mp/BetterAbstractMojoTestCase.java  |   3 +-
 .../test/java/org/apache/rat/mp/MavenOption.java   |  91 ++++
 .../java/org/apache/rat/mp/OptionMojoTest.java     | 361 +++++++++++++
 .../java/org/apache/rat/mp/RatCheckMojoTest.java   |   8 +-
 .../java/org/apache/rat/mp/RatTestHelpers.java     |   2 +-
 .../src/test/resources/OptionTools/One.xml         |  12 +-
 .../src/test/resources/OptionTools/Two.xml         |  12 +-
 apache-rat-tasks/pom.xml                           |  88 ++-
 .../main/java/org/apache/rat/anttasks/Report.java  | 299 ++++++++---
 .../java/org/apache/rat/anttasks/AntOption.java    |  80 +++
 .../org/apache/rat/anttasks/ReportOptionTest.java  | 431 +++++++++++++++
 .../java/org/apache/rat/anttasks/ReportTest.java   |   1 +
 .../src/test/resources/OptionTools/One.xml         |  12 +-
 .../src/test/resources/OptionTools/Two.xml         |  12 +-
 .../src/test/resources/antunit/report-options.xml  |  48 ++
 apache-rat-tools/pom.xml                           |  26 +-
 .../java/org/apache/rat/tools/AntGenerator.java    | 172 ++++++
 .../main/java/org/apache/rat/tools/AntOption.java  | 118 ++++
 .../org/apache/rat/{ => tools}/Documentation.java  |  39 +-
 .../java/org/apache/rat/tools/MavenGenerator.java  | 171 ++++++
 .../java/org/apache/rat/tools/MavenOption.java     | 125 +++++
 .../src/main/java/org/apache/rat/tools/Naming.java |  86 +++
 .../java/org/apache/rat/tools/package-info.java    |  21 +
 apache-rat-tools/src/main/resources/Ant.tpl        | 135 +++++
 apache-rat-tools/src/main/resources/Maven.tpl      | 118 ++++
 pom.xml                                            |  34 +-
 src/changes/changes.xml                            |   6 +
 src/conf/checkstyle-suppressions.xml               |  45 ++
 src/conf/checkstyle.xml                            | 154 ++++++
 src/site/apt/index.apt.vm                          |   2 +
 src/site/apt/license_def.apt.vm                    |   5 +-
 src/site/apt/ui_def.apt.vm                         |  58 ++
 61 files changed, 4580 insertions(+), 1763 deletions(-)

diff --cc pom.xml
index 8aa6e566,34571201..d3e7dc31
--- a/pom.xml
+++ b/pom.xml
@@@ -318,10 -339,10 +339,10 @@@ agnostic home for software distributio
          <plugin>
            <groupId>com.github.spotbugs</groupId>
            <artifactId>spotbugs-maven-plugin</artifactId>
 -          <version>4.8.5.0</version>
 +          <version>4.8.6.1</version>
            <configuration>
-             <!-- RAT-369: JDK21 finds 67 errors, while older releases find 63 
-->
-             <maxAllowedViolations>67</maxAllowedViolations>
+             <!-- RAT-369: JDK21 finds 70 errors, while older releases find 63 
-->
+             <maxAllowedViolations>70</maxAllowedViolations>
              <failOnError>true</failOnError>
              <!-- we only want to see our own problems and in all subpackages 
-->
              <onlyAnalyze>org.apache.rat.-</onlyAnalyze>

Reply via email to