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 5f868bf235f6c0bc1d8e4308efd3ea8d5377a851 Merge: 4e4ee55b 742b2787 Author: P. Ottlinger <[email protected]> AuthorDate: Thu Dec 12 09:23:41 2024 +0100 Merge pull request #409 from Claudenw/RAT-98_report_skipped_files RAT-98 report skipped files apache-rat-core/pom.xml | 27 +++ .../src/it/java/org/apache/rat/ReportTest.java | 7 +- .../it/resources/ReportTest/RAT_14/verify.groovy | 24 +-- .../it/resources/ReportTest/RAT_259/verify.groovy | 8 +- .../ReportTest/RAT_335/expected-message.txt | 1 + .../src/it/resources/ReportTest/RAT_335/ignore.txt | 7 + .../src/it/resources/ReportTest/RAT_335}/pom.xml | 1 + .../it/resources/ReportTest/RAT_335/src/README.txt | 12 ++ .../resources/ReportTest/RAT_335/src/dir1/dir1.md | 1 + .../resources/ReportTest/RAT_335/src/dir2/dir2.txt | 1 + .../ReportTest/RAT_335/src/dir3/file3.log | 1 + .../ReportTest/RAT_335/src/invoker.properties | 16 ++ .../it/resources/ReportTest/RAT_335/verify.groovy | 125 +++++++++++ .../java/org/apache/rat/ReportConfiguration.java | 10 + .../rat/analysis/DefaultAnalyserFactory.java | 54 +++-- .../rat/analysis/DocumentHeaderAnalyser.java | 27 ++- .../org/apache/rat/analysis/HeaderCheckWorker.java | 31 +-- .../org/apache/rat/analysis/TikaProcessor.java | 9 +- .../src/main/java/org/apache/rat/api/Document.java | 16 +- .../src/main/java/org/apache/rat/api/MetaData.java | 27 ++- .../main/java/org/apache/rat/commandline/Arg.java | 3 +- .../java/org/apache/rat/document/FileDocument.java | 15 +- .../{FileDocument.java => IgnoredDocument.java} | 47 +---- .../org/apache/rat/license/ILicenseFamily.java | 2 - .../apache/rat/report/claim/ClaimStatistic.java | 18 +- .../org/apache/rat/report/xml/XmlElements.java | 9 +- .../org/apache/rat/walker/DirectoryWalker.java | 2 +- .../src/main/resources/org/apache/rat/default.xml | 8 - .../main/resources/org/apache/rat/plain-rat.xsl | 11 +- .../main/resources/org/apache/rat/rat-report.xsd | 3 +- .../src/test/java/org/apache/rat/DefaultsTest.java | 2 +- .../src/test/java/org/apache/rat/ReporterTest.java | 137 +++++++++--- .../rat/analysis/DefaultAnalyserFactoryTest.java | 26 +-- .../org/apache/rat/analysis/GeneratedFileTest.java | 83 ++++++++ .../apache/rat/analysis/HeaderCheckWorkerTest.java | 22 +- .../org/apache/rat/analysis/TikaProcessorTest.java | 4 +- .../rat/analysis/license/GeneratedLicenseTest.java | 51 ----- .../fileProcessors/GitFileProcessorTest.java | 14 ++ .../configuration/XMLConfigurationReaderTest.java | 6 +- .../configuration/XMLConfigurationWriterTest.java | 42 ---- .../org/apache/rat/document/FileDocumentTest.java | 2 +- .../org/apache/rat/policy/DefaultPolicyTest.java | 4 +- .../apache/rat/report/ConfigurationReportTest.java | 2 +- .../rat/report/xml/XmlReportFactoryTest.java | 4 +- .../apache/rat/test/AbstractOptionsProvider.java | 22 +- .../java/org/apache/rat/test/utils/Resources.java | 28 +-- .../java/org/apache/rat/testhelpers/XmlUtils.java | 20 ++ .../org/apache/rat/walker/DirectoryWalkerTest.java | 53 +++-- .../src/test/resources/RAT_355/commandLine.txt | 7 + .../test/resources/RAT_355/expected-message.txt | 1 + .../src/test/resources/RAT_355}/pom.xml | 1 + .../src/test/resources/RAT_355/src/README.txt | 12 ++ .../src/test/resources/RAT_355/src/dir1/dir1.md | 1 + .../src/test/resources/RAT_355/src/dir2/dir2.txt | 1 + .../src/test/resources/RAT_355/src/dir3/file3.log | 1 + .../test/resources/RAT_355/src/invoker.properties | 16 ++ .../src/test/resources/RAT_355/verify.groovy | 125 +++++++++++ apache-rat-plugin/pom.xml | 7 +- apache-rat-plugin/src/it/it1/pom.xml | 16 +- apache-rat-plugin/src/it/it1/verify.groovy | 30 ++- .../java/org/apache/rat/mp/RatCheckMojoTest.java | 234 ++++++++++++++++----- .../test/resources/unit/RAT-335-GitIgnore/pom.xml | 1 + .../src/test/resources/unit/it1/pom.xml | 1 + .../src/test/resources/unit/it5/pom.xml | 19 +- apache-rat-tasks/pom.xml | 9 + apache-rat-testdata/pom.xml | 52 +++++ .../.hiddenDirectory/fileInHiddenDirectory | 1 + .../examples/exampleData}/ILoggerFactory.java | 0 .../main/resources/examples/exampleData}/Image.png | Bin .../main/resources/examples/exampleData}/LICENSE | 0 .../main/resources/examples/exampleData}/NOTICE | 0 .../resources/examples/exampleData}/Source.java | 0 .../main/resources/examples/exampleData}/Text.txt | 0 .../resources/examples/exampleData}/TextHttps.txt | 0 .../main/resources/examples/exampleData}/Xml.xml | 0 .../main/resources/examples/exampleData}/buildr.rb | 0 .../main/resources/examples/exampleData}/dummy.jar | Bin .../resources/examples/exampleData}/generated.txt | 0 .../resources/examples/exampleData}/plain.json | 0 .../resources/examples/exampleData}/sub/Empty.txt | 0 .../main/resources/examples/exampleData}/tri.txt | 0 apache-rat-tools/pom.xml | 12 ++ apache-rat/.gitignore | 1 + apache-rat/pom.xml | 92 +++++++- apache-rat/src/site/examples/default_output.txt | 134 ------------ apache-rat/src/site/examples/rat-report.txt | 79 ------- .../src/site/examples/unapproved-licenses.txt | 6 - pom.xml | 6 + 88 files changed, 1266 insertions(+), 644 deletions(-) diff --cc apache-rat/pom.xml index b7acc654,186e6e49..913510bd --- a/apache-rat/pom.xml +++ b/apache-rat/pom.xml @@@ -40,8 -40,24 +40,13 @@@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-tasks</artifactId> </dependency> + <dependency> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-testdata</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> - <resources> - <resource> - <directory>..</directory> - <targetPath>META-INF</targetPath> - <includes> - <include>RELEASE_NOTES.txt</include> - <include>LICENSE</include> - <include>NOTICE</include> - </includes> - </resource> - </resources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@@ -56,19 -72,8 +61,20 @@@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> + <!-- Copy resource files from the apache-rat-core project. --> + <execution> + <id>copy-release-notes-from-core</id> + <goals><goal>unpack-dependencies</goal></goals> + <phase>generate-resources</phase> + <configuration> + <includeArtifactIds>apache-rat-core</includeArtifactIds> + <excludeClassifiers>tests</excludeClassifiers> + <include>META-INF/RELEASE_NOTES.txt</include> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + </configuration> + </execution> <execution> + <id>unpack dependencies</id> <phase>prepare-package</phase> <goals> <goal>unpack-dependencies</goal>
